From 58745c41ec65d13a59559d423f698f9f8ad92361 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 4 Jul 2019 00:23:59 +0300 Subject: Release version 1.1.1+4 Upgrade to 1.1.1c. --- upstream-build/configdata.pm/i686-win32-msvc | 937 ++++++++++++++------------- 1 file changed, 499 insertions(+), 438 deletions(-) (limited to 'upstream-build/configdata.pm/i686-win32-msvc') diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc index f40f600..ca9726d 100644 --- a/upstream-build/configdata.pm/i686-win32-msvc +++ b/upstream-build/configdata.pm/i686-win32-msvc @@ -30,6 +30,7 @@ our %config = ( MTFLAGS => [ "-nologo" ], PERL => "C:\\Perl64\\bin\\perl.exe", RC => "rc", + RCFLAGS => [ ], afalgeng => "", b32 => "1", b64 => "0", @@ -41,7 +42,7 @@ our %config = ( build_type => "release", builddir => ".", cflags => [ ], - conf_files => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\shared-info.pl" ], + conf_files => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf" ], cppflags => [ ], cxxflags => [ ], defines => [ "NDEBUG" ], @@ -62,11 +63,11 @@ our %config = ( openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", - options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-asan no-asm no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic", + options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic", perl_archname => "MSWin32-x64-multi-thread", perl_cmd => "C:\\Perl64\\bin\\perl.exe", perl_version => "5.26.3", - perlargv => [ "VC-WIN32", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm" ], + perlargv => [ "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "VC-WIN32" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -114,8 +115,8 @@ our %config = ( sourcedir => "..", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1a", - version_num => "0x1010101fL", + version => "1.1.1c", + version_num => "0x1010103fL", ); our %target = ( @@ -131,7 +132,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0xd6d040)", + RANLIB => "CODE(0x259cf38)", 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", @@ -237,6 +238,7 @@ our @disablables = ( "autoload-config", "bf", "blake2", + "buildtest-c\\+\\+", "camellia", "capieng", "cast", @@ -253,7 +255,6 @@ our @disablables = ( "dgram", "dh", "dsa", - "dso", "dtls", "dynamic-engine", "ec", @@ -279,6 +280,7 @@ our @disablables = ( "msan", "multiblock", "nextprotoneg", + "pinshared", "ocb", "ocsp", "pic", @@ -337,9 +339,10 @@ our %disabled = ( "afalgeng" => "not-linux", "asan" => "default", "asm" => "option", + "buildtest-c++" => "default", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", - "devcryptoeng" => "default", + "devcryptoeng" => "option", "ec_nistp_64_gcc_128" => "default", "egd" => "default", "external-tests" => "default", @@ -818,6 +821,11 @@ our %unified_info = ( "libcrypto", "test\\libtestutil.a", ], + "test\\bio_memleak_test" => + [ + "libcrypto", + "test\\libtestutil.a", + ], "test\\bioprinttest" => [ "libcrypto", @@ -828,357 +836,357 @@ our %unified_info = ( "libcrypto", "test\\libtestutil.a", ], - "test\\buildtest_aes" => + "test\\buildtest_c_aes" => [ "libcrypto", "libssl", ], - "test\\buildtest_asn1" => + "test\\buildtest_c_asn1" => [ "libcrypto", "libssl", ], - "test\\buildtest_asn1t" => + "test\\buildtest_c_asn1t" => [ "libcrypto", "libssl", ], - "test\\buildtest_async" => + "test\\buildtest_c_async" => [ "libcrypto", "libssl", ], - "test\\buildtest_bio" => + "test\\buildtest_c_bio" => [ "libcrypto", "libssl", ], - "test\\buildtest_blowfish" => + "test\\buildtest_c_blowfish" => [ "libcrypto", "libssl", ], - "test\\buildtest_bn" => + "test\\buildtest_c_bn" => [ "libcrypto", "libssl", ], - "test\\buildtest_buffer" => + "test\\buildtest_c_buffer" => [ "libcrypto", "libssl", ], - "test\\buildtest_camellia" => + "test\\buildtest_c_camellia" => [ "libcrypto", "libssl", ], - "test\\buildtest_cast" => + "test\\buildtest_c_cast" => [ "libcrypto", "libssl", ], - "test\\buildtest_cmac" => + "test\\buildtest_c_cmac" => [ "libcrypto", "libssl", ], - "test\\buildtest_cms" => + "test\\buildtest_c_cms" => [ "libcrypto", "libssl", ], - "test\\buildtest_comp" => + "test\\buildtest_c_comp" => [ "libcrypto", "libssl", ], - "test\\buildtest_conf" => + "test\\buildtest_c_conf" => [ "libcrypto", "libssl", ], - "test\\buildtest_conf_api" => + "test\\buildtest_c_conf_api" => [ "libcrypto", "libssl", ], - "test\\buildtest_crypto" => + "test\\buildtest_c_crypto" => [ "libcrypto", "libssl", ], - "test\\buildtest_ct" => + "test\\buildtest_c_ct" => [ "libcrypto", "libssl", ], - "test\\buildtest_des" => + "test\\buildtest_c_des" => [ "libcrypto", "libssl", ], - "test\\buildtest_dh" => + "test\\buildtest_c_dh" => [ "libcrypto", "libssl", ], - "test\\buildtest_dsa" => + "test\\buildtest_c_dsa" => [ "libcrypto", "libssl", ], - "test\\buildtest_dtls1" => + "test\\buildtest_c_dtls1" => [ "libcrypto", "libssl", ], - "test\\buildtest_e_os2" => + "test\\buildtest_c_e_os2" => [ "libcrypto", "libssl", ], - "test\\buildtest_ebcdic" => + "test\\buildtest_c_ebcdic" => [ "libcrypto", "libssl", ], - "test\\buildtest_ec" => + "test\\buildtest_c_ec" => [ "libcrypto", "libssl", ], - "test\\buildtest_ecdh" => + "test\\buildtest_c_ecdh" => [ "libcrypto", "libssl", ], - "test\\buildtest_ecdsa" => + "test\\buildtest_c_ecdsa" => [ "libcrypto", "libssl", ], - "test\\buildtest_engine" => + "test\\buildtest_c_engine" => [ "libcrypto", "libssl", ], - "test\\buildtest_evp" => + "test\\buildtest_c_evp" => [ "libcrypto", "libssl", ], - "test\\buildtest_hmac" => + "test\\buildtest_c_hmac" => [ "libcrypto", "libssl", ], - "test\\buildtest_idea" => + "test\\buildtest_c_idea" => [ "libcrypto", "libssl", ], - "test\\buildtest_kdf" => + "test\\buildtest_c_kdf" => [ "libcrypto", "libssl", ], - "test\\buildtest_lhash" => + "test\\buildtest_c_lhash" => [ "libcrypto", "libssl", ], - "test\\buildtest_md2" => + "test\\buildtest_c_md2" => [ "libcrypto", "libssl", ], - "test\\buildtest_md4" => + "test\\buildtest_c_md4" => [ "libcrypto", "libssl", ], - "test\\buildtest_md5" => + "test\\buildtest_c_md5" => [ "libcrypto", "libssl", ], - "test\\buildtest_modes" => + "test\\buildtest_c_modes" => [ "libcrypto", "libssl", ], - "test\\buildtest_obj_mac" => + "test\\buildtest_c_obj_mac" => [ "libcrypto", "libssl", ], - "test\\buildtest_objects" => + "test\\buildtest_c_objects" => [ "libcrypto", "libssl", ], - "test\\buildtest_ocsp" => + "test\\buildtest_c_ocsp" => [ "libcrypto", "libssl", ], - "test\\buildtest_opensslv" => + "test\\buildtest_c_opensslv" => [ "libcrypto", "libssl", ], - "test\\buildtest_ossl_typ" => + "test\\buildtest_c_ossl_typ" => [ "libcrypto", "libssl", ], - "test\\buildtest_pem" => + "test\\buildtest_c_pem" => [ "libcrypto", "libssl", ], - "test\\buildtest_pem2" => + "test\\buildtest_c_pem2" => [ "libcrypto", "libssl", ], - "test\\buildtest_pkcs12" => + "test\\buildtest_c_pkcs12" => [ "libcrypto", "libssl", ], - "test\\buildtest_pkcs7" => + "test\\buildtest_c_pkcs7" => [ "libcrypto", "libssl", ], - "test\\buildtest_rand" => + "test\\buildtest_c_rand" => [ "libcrypto", "libssl", ], - "test\\buildtest_rand_drbg" => + "test\\buildtest_c_rand_drbg" => [ "libcrypto", "libssl", ], - "test\\buildtest_rc2" => + "test\\buildtest_c_rc2" => [ "libcrypto", "libssl", ], - "test\\buildtest_rc4" => + "test\\buildtest_c_rc4" => [ "libcrypto", "libssl", ], - "test\\buildtest_rc5" => + "test\\buildtest_c_rc5" => [ "libcrypto", "libssl", ], - "test\\buildtest_ripemd" => + "test\\buildtest_c_ripemd" => [ "libcrypto", "libssl", ], - "test\\buildtest_rsa" => + "test\\buildtest_c_rsa" => [ "libcrypto", "libssl", ], - "test\\buildtest_safestack" => + "test\\buildtest_c_safestack" => [ "libcrypto", "libssl", ], - "test\\buildtest_seed" => + "test\\buildtest_c_seed" => [ "libcrypto", "libssl", ], - "test\\buildtest_sha" => + "test\\buildtest_c_sha" => [ "libcrypto", "libssl", ], - "test\\buildtest_srp" => + "test\\buildtest_c_srp" => [ "libcrypto", "libssl", ], - "test\\buildtest_srtp" => + "test\\buildtest_c_srtp" => [ "libcrypto", "libssl", ], - "test\\buildtest_ssl" => + "test\\buildtest_c_ssl" => [ "libcrypto", "libssl", ], - "test\\buildtest_ssl2" => + "test\\buildtest_c_ssl2" => [ "libcrypto", "libssl", ], - "test\\buildtest_ssl3" => + "test\\buildtest_c_ssl3" => [ "libcrypto", "libssl", ], - "test\\buildtest_stack" => + "test\\buildtest_c_stack" => [ "libcrypto", "libssl", ], - "test\\buildtest_store" => + "test\\buildtest_c_store" => [ "libcrypto", "libssl", ], - "test\\buildtest_symhacks" => + "test\\buildtest_c_symhacks" => [ "libcrypto", "libssl", ], - "test\\buildtest_tls1" => + "test\\buildtest_c_tls1" => [ "libcrypto", "libssl", ], - "test\\buildtest_ts" => + "test\\buildtest_c_ts" => [ "libcrypto", "libssl", ], - "test\\buildtest_txt_db" => + "test\\buildtest_c_txt_db" => [ "libcrypto", "libssl", ], - "test\\buildtest_ui" => + "test\\buildtest_c_ui" => [ "libcrypto", "libssl", ], - "test\\buildtest_whrlpool" => + "test\\buildtest_c_whrlpool" => [ "libcrypto", "libssl", ], - "test\\buildtest_x509" => + "test\\buildtest_c_x509" => [ "libcrypto", "libssl", ], - "test\\buildtest_x509_vfy" => + "test\\buildtest_c_x509_vfy" => [ "libcrypto", "libssl", ], - "test\\buildtest_x509v3" => + "test\\buildtest_c_x509v3" => [ "libcrypto", "libssl", @@ -1310,6 +1318,11 @@ our %unified_info = ( "libssl", "test\\libtestutil.a", ], + "test\\ec_internal_test" => + [ + "libcrypto.a", + "test\\libtestutil.a", + ], "test\\ecdsatest" => [ "libcrypto", @@ -1508,10 +1521,6 @@ our %unified_info = ( "libssl", "test\\libtestutil.a", ], - "test\\shlibloadtest" => - [ - "test\\libtestutil.a", - ], "test\\siphash_internal_test" => [ "libcrypto.a", @@ -3717,6 +3726,11 @@ our %unified_info = ( "..\\crypto\\chacha\\asm\\chacha-ppc.pl", "\$(PERLASM_SCHEME)", ], + "crypto\\chacha\\chacha-s390x.S" => + [ + "..\\crypto\\chacha\\asm\\chacha-s390x.pl", + "\$(PERLASM_SCHEME)", + ], "crypto\\chacha\\chacha-x86.s" => [ "..\\crypto\\chacha\\asm\\chacha-x86.pl", @@ -3919,6 +3933,11 @@ our %unified_info = ( "..\\crypto\\poly1305\\asm\\poly1305-ppcfp.pl", "\$(PERLASM_SCHEME)", ], + "crypto\\poly1305\\poly1305-s390x.S" => + [ + "..\\crypto\\poly1305\\asm\\poly1305-s390x.pl", + "\$(PERLASM_SCHEME)", + ], "crypto\\poly1305\\poly1305-sparcv9.S" => [ "..\\crypto\\poly1305\\asm\\poly1305-sparcv9.pl", @@ -3960,6 +3979,11 @@ our %unified_info = ( "..\\crypto\\rc4\\asm\\rc4-parisc.pl", "\$(PERLASM_SCHEME)", ], + "crypto\\rc4\\rc4-s390x.s" => + [ + "..\\crypto\\rc4\\asm\\rc4-s390x.pl", + "\$(PERLASM_SCHEME)", + ], "crypto\\rc4\\rc4-x86_64.s" => [ "..\\crypto\\rc4\\asm\\rc4-x86_64.pl", @@ -6583,6 +6607,11 @@ our %unified_info = ( "crypto", "..\\crypto", ], + "crypto\\chacha\\chacha-s390x.o" => + [ + "crypto", + "..\\crypto", + ], "crypto\\chacha\\chacha_enc.o" => [ ".", @@ -11656,6 +11685,11 @@ our %unified_info = ( "include", "..\\include", ], + "test\\bio_memleak_test.o" => + [ + "include", + "..\\include", + ], "test\\bioprinttest.o" => [ "include", @@ -12168,6 +12202,15 @@ our %unified_info = ( "include", "..\\include", ], + "test\\ec_internal_test.o" => + [ + "include", + "crypto\\ec", + "crypto\\include", + "..\\include", + "..\\crypto\\ec", + "..\\crypto\\include", + ], "test\\ecdsatest.o" => [ "include", @@ -12696,79 +12739,80 @@ our %unified_info = ( "test\\bftest", "test\\bio_callback_test", "test\\bio_enc_test", + "test\\bio_memleak_test", "test\\bioprinttest", "test\\bntest", - "test\\buildtest_aes", - "test\\buildtest_asn1", - "test\\buildtest_asn1t", - "test\\buildtest_async", - "test\\buildtest_bio", - "test\\buildtest_blowfish", - "test\\buildtest_bn", - "test\\buildtest_buffer", - "test\\buildtest_camellia", - "test\\buildtest_cast", - "test\\buildtest_cmac", - "test\\buildtest_cms", - "test\\buildtest_comp", - "test\\buildtest_conf", - "test\\buildtest_conf_api", - "test\\buildtest_crypto", - "test\\buildtest_ct", - "test\\buildtest_des", - "test\\buildtest_dh", - "test\\buildtest_dsa", - "test\\buildtest_dtls1", - "test\\buildtest_e_os2", - "test\\buildtest_ebcdic", - "test\\buildtest_ec", - "test\\buildtest_ecdh", - "test\\buildtest_ecdsa", - "test\\buildtest_engine", - "test\\buildtest_evp", - "test\\buildtest_hmac", - "test\\buildtest_idea", - "test\\buildtest_kdf", - "test\\buildtest_lhash", - "test\\buildtest_md2", - "test\\buildtest_md4", - "test\\buildtest_md5", - "test\\buildtest_modes", - "test\\buildtest_obj_mac", - "test\\buildtest_objects", - "test\\buildtest_ocsp", - "test\\buildtest_opensslv", - "test\\buildtest_ossl_typ", - "test\\buildtest_pem", - "test\\buildtest_pem2", - "test\\buildtest_pkcs12", - "test\\buildtest_pkcs7", - "test\\buildtest_rand", - "test\\buildtest_rand_drbg", - "test\\buildtest_rc2", - "test\\buildtest_rc4", - "test\\buildtest_rc5", - "test\\buildtest_ripemd", - "test\\buildtest_rsa", - "test\\buildtest_safestack", - "test\\buildtest_seed", - "test\\buildtest_sha", - "test\\buildtest_srp", - "test\\buildtest_srtp", - "test\\buildtest_ssl", - "test\\buildtest_ssl2", - "test\\buildtest_ssl3", - "test\\buildtest_stack", - "test\\buildtest_store", - "test\\buildtest_symhacks", - "test\\buildtest_tls1", - "test\\buildtest_ts", - "test\\buildtest_txt_db", - "test\\buildtest_ui", - "test\\buildtest_whrlpool", - "test\\buildtest_x509", - "test\\buildtest_x509_vfy", - "test\\buildtest_x509v3", + "test\\buildtest_c_aes", + "test\\buildtest_c_asn1", + "test\\buildtest_c_asn1t", + "test\\buildtest_c_async", + "test\\buildtest_c_bio", + "test\\buildtest_c_blowfish", + "test\\buildtest_c_bn", + "test\\buildtest_c_buffer", + "test\\buildtest_c_camellia", + "test\\buildtest_c_cast", + "test\\buildtest_c_cmac", + "test\\buildtest_c_cms", + "test\\buildtest_c_comp", + "test\\buildtest_c_conf", + "test\\buildtest_c_conf_api", + "test\\buildtest_c_crypto", + "test\\buildtest_c_ct", + "test\\buildtest_c_des", + "test\\buildtest_c_dh", + "test\\buildtest_c_dsa", + "test\\buildtest_c_dtls1", + "test\\buildtest_c_e_os2", + "test\\buildtest_c_ebcdic", + "test\\buildtest_c_ec", + "test\\buildtest_c_ecdh", + "test\\buildtest_c_ecdsa", + "test\\buildtest_c_engine", + "test\\buildtest_c_evp", + "test\\buildtest_c_hmac", + "test\\buildtest_c_idea", + "test\\buildtest_c_kdf", + "test\\buildtest_c_lhash", + "test\\buildtest_c_md2", + "test\\buildtest_c_md4", + "test\\buildtest_c_md5", + "test\\buildtest_c_modes", + "test\\buildtest_c_obj_mac", + "test\\buildtest_c_objects", + "test\\buildtest_c_ocsp", + "test\\buildtest_c_opensslv", + "test\\buildtest_c_ossl_typ", + "test\\buildtest_c_pem", + "test\\buildtest_c_pem2", + "test\\buildtest_c_pkcs12", + "test\\buildtest_c_pkcs7", + "test\\buildtest_c_rand", + "test\\buildtest_c_rand_drbg", + "test\\buildtest_c_rc2", + "test\\buildtest_c_rc4", + "test\\buildtest_c_rc5", + "test\\buildtest_c_ripemd", + "test\\buildtest_c_rsa", + "test\\buildtest_c_safestack", + "test\\buildtest_c_seed", + "test\\buildtest_c_sha", + "test\\buildtest_c_srp", + "test\\buildtest_c_srtp", + "test\\buildtest_c_ssl", + "test\\buildtest_c_ssl2", + "test\\buildtest_c_ssl3", + "test\\buildtest_c_stack", + "test\\buildtest_c_store", + "test\\buildtest_c_symhacks", + "test\\buildtest_c_tls1", + "test\\buildtest_c_ts", + "test\\buildtest_c_txt_db", + "test\\buildtest_c_ui", + "test\\buildtest_c_whrlpool", + "test\\buildtest_c_x509", + "test\\buildtest_c_x509_vfy", + "test\\buildtest_c_x509v3", "test\\casttest", "test\\chacha_internal_test", "test\\cipherbytes_test", @@ -12793,6 +12837,7 @@ our %unified_info = ( "test\\dtls_mtu_test", "test\\dtlstest", "test\\dtlsv1listentest", + "test\\ec_internal_test", "test\\ecdsatest", "test\\ecstresstest", "test\\ectest", @@ -16883,6 +16928,14 @@ our %unified_info = ( [ "..\\test\\bio_enc_test.c", ], + "test\\bio_memleak_test" => + [ + "test\\bio_memleak_test.o", + ], + "test\\bio_memleak_test.o" => + [ + "..\\test\\bio_memleak_test.c", + ], "test\\bioprinttest" => [ "test\\bioprinttest.o", @@ -16899,569 +16952,569 @@ our %unified_info = ( [ "..\\test\\bntest.c", ], - "test\\buildtest_aes" => - [ - "test\\buildtest_aes.o", - ], "test\\buildtest_aes.o" => [ "test\\buildtest_aes.c", ], - "test\\buildtest_asn1" => - [ - "test\\buildtest_asn1.o", - ], "test\\buildtest_asn1.o" => [ "test\\buildtest_asn1.c", ], - "test\\buildtest_asn1t" => - [ - "test\\buildtest_asn1t.o", - ], "test\\buildtest_asn1t.o" => [ "test\\buildtest_asn1t.c", ], - "test\\buildtest_async" => - [ - "test\\buildtest_async.o", - ], "test\\buildtest_async.o" => [ "test\\buildtest_async.c", ], - "test\\buildtest_bio" => - [ - "test\\buildtest_bio.o", - ], "test\\buildtest_bio.o" => [ "test\\buildtest_bio.c", ], - "test\\buildtest_blowfish" => - [ - "test\\buildtest_blowfish.o", - ], "test\\buildtest_blowfish.o" => [ "test\\buildtest_blowfish.c", ], - "test\\buildtest_bn" => - [ - "test\\buildtest_bn.o", - ], "test\\buildtest_bn.o" => [ "test\\buildtest_bn.c", ], - "test\\buildtest_buffer" => - [ - "test\\buildtest_buffer.o", - ], "test\\buildtest_buffer.o" => [ "test\\buildtest_buffer.c", ], - "test\\buildtest_camellia" => + "test\\buildtest_c_aes" => [ - "test\\buildtest_camellia.o", + "test\\buildtest_aes.o", ], - "test\\buildtest_camellia.o" => + "test\\buildtest_c_asn1" => [ - "test\\buildtest_camellia.c", + "test\\buildtest_asn1.o", ], - "test\\buildtest_cast" => + "test\\buildtest_c_asn1t" => [ - "test\\buildtest_cast.o", + "test\\buildtest_asn1t.o", ], - "test\\buildtest_cast.o" => + "test\\buildtest_c_async" => [ - "test\\buildtest_cast.c", + "test\\buildtest_async.o", ], - "test\\buildtest_cmac" => + "test\\buildtest_c_bio" => [ - "test\\buildtest_cmac.o", + "test\\buildtest_bio.o", ], - "test\\buildtest_cmac.o" => + "test\\buildtest_c_blowfish" => [ - "test\\buildtest_cmac.c", + "test\\buildtest_blowfish.o", ], - "test\\buildtest_cms" => + "test\\buildtest_c_bn" => [ - "test\\buildtest_cms.o", + "test\\buildtest_bn.o", ], - "test\\buildtest_cms.o" => + "test\\buildtest_c_buffer" => [ - "test\\buildtest_cms.c", + "test\\buildtest_buffer.o", ], - "test\\buildtest_comp" => + "test\\buildtest_c_camellia" => [ - "test\\buildtest_comp.o", + "test\\buildtest_camellia.o", ], - "test\\buildtest_comp.o" => + "test\\buildtest_c_cast" => [ - "test\\buildtest_comp.c", + "test\\buildtest_cast.o", ], - "test\\buildtest_conf" => + "test\\buildtest_c_cmac" => [ - "test\\buildtest_conf.o", + "test\\buildtest_cmac.o", ], - "test\\buildtest_conf.o" => + "test\\buildtest_c_cms" => [ - "test\\buildtest_conf.c", + "test\\buildtest_cms.o", ], - "test\\buildtest_conf_api" => + "test\\buildtest_c_comp" => [ - "test\\buildtest_conf_api.o", + "test\\buildtest_comp.o", ], - "test\\buildtest_conf_api.o" => + "test\\buildtest_c_conf" => [ - "test\\buildtest_conf_api.c", + "test\\buildtest_conf.o", ], - "test\\buildtest_crypto" => + "test\\buildtest_c_conf_api" => [ - "test\\buildtest_crypto.o", + "test\\buildtest_conf_api.o", ], - "test\\buildtest_crypto.o" => + "test\\buildtest_c_crypto" => [ - "test\\buildtest_crypto.c", + "test\\buildtest_crypto.o", ], - "test\\buildtest_ct" => + "test\\buildtest_c_ct" => [ "test\\buildtest_ct.o", ], - "test\\buildtest_ct.o" => + "test\\buildtest_c_des" => [ - "test\\buildtest_ct.c", + "test\\buildtest_des.o", ], - "test\\buildtest_des" => + "test\\buildtest_c_dh" => [ - "test\\buildtest_des.o", + "test\\buildtest_dh.o", ], - "test\\buildtest_des.o" => + "test\\buildtest_c_dsa" => [ - "test\\buildtest_des.c", + "test\\buildtest_dsa.o", ], - "test\\buildtest_dh" => + "test\\buildtest_c_dtls1" => [ - "test\\buildtest_dh.o", + "test\\buildtest_dtls1.o", ], - "test\\buildtest_dh.o" => + "test\\buildtest_c_e_os2" => [ - "test\\buildtest_dh.c", + "test\\buildtest_e_os2.o", ], - "test\\buildtest_dsa" => + "test\\buildtest_c_ebcdic" => [ - "test\\buildtest_dsa.o", + "test\\buildtest_ebcdic.o", ], - "test\\buildtest_dsa.o" => + "test\\buildtest_c_ec" => [ - "test\\buildtest_dsa.c", + "test\\buildtest_ec.o", ], - "test\\buildtest_dtls1" => + "test\\buildtest_c_ecdh" => [ - "test\\buildtest_dtls1.o", + "test\\buildtest_ecdh.o", ], - "test\\buildtest_dtls1.o" => + "test\\buildtest_c_ecdsa" => [ - "test\\buildtest_dtls1.c", + "test\\buildtest_ecdsa.o", ], - "test\\buildtest_e_os2" => + "test\\buildtest_c_engine" => [ - "test\\buildtest_e_os2.o", + "test\\buildtest_engine.o", ], - "test\\buildtest_e_os2.o" => + "test\\buildtest_c_evp" => [ - "test\\buildtest_e_os2.c", + "test\\buildtest_evp.o", ], - "test\\buildtest_ebcdic" => + "test\\buildtest_c_hmac" => [ - "test\\buildtest_ebcdic.o", + "test\\buildtest_hmac.o", ], - "test\\buildtest_ebcdic.o" => + "test\\buildtest_c_idea" => [ - "test\\buildtest_ebcdic.c", + "test\\buildtest_idea.o", ], - "test\\buildtest_ec" => + "test\\buildtest_c_kdf" => [ - "test\\buildtest_ec.o", + "test\\buildtest_kdf.o", ], - "test\\buildtest_ec.o" => + "test\\buildtest_c_lhash" => [ - "test\\buildtest_ec.c", + "test\\buildtest_lhash.o", ], - "test\\buildtest_ecdh" => + "test\\buildtest_c_md2" => [ - "test\\buildtest_ecdh.o", + "test\\buildtest_md2.o", ], - "test\\buildtest_ecdh.o" => + "test\\buildtest_c_md4" => [ - "test\\buildtest_ecdh.c", + "test\\buildtest_md4.o", ], - "test\\buildtest_ecdsa" => + "test\\buildtest_c_md5" => [ - "test\\buildtest_ecdsa.o", + "test\\buildtest_md5.o", ], - "test\\buildtest_ecdsa.o" => + "test\\buildtest_c_modes" => [ - "test\\buildtest_ecdsa.c", + "test\\buildtest_modes.o", ], - "test\\buildtest_engine" => + "test\\buildtest_c_obj_mac" => [ - "test\\buildtest_engine.o", + "test\\buildtest_obj_mac.o", ], - "test\\buildtest_engine.o" => + "test\\buildtest_c_objects" => [ - "test\\buildtest_engine.c", + "test\\buildtest_objects.o", ], - "test\\buildtest_evp" => + "test\\buildtest_c_ocsp" => [ - "test\\buildtest_evp.o", + "test\\buildtest_ocsp.o", ], - "test\\buildtest_evp.o" => + "test\\buildtest_c_opensslv" => [ - "test\\buildtest_evp.c", + "test\\buildtest_opensslv.o", ], - "test\\buildtest_hmac" => + "test\\buildtest_c_ossl_typ" => [ - "test\\buildtest_hmac.o", + "test\\buildtest_ossl_typ.o", ], - "test\\buildtest_hmac.o" => + "test\\buildtest_c_pem" => [ - "test\\buildtest_hmac.c", + "test\\buildtest_pem.o", ], - "test\\buildtest_idea" => + "test\\buildtest_c_pem2" => [ - "test\\buildtest_idea.o", + "test\\buildtest_pem2.o", ], - "test\\buildtest_idea.o" => + "test\\buildtest_c_pkcs12" => [ - "test\\buildtest_idea.c", + "test\\buildtest_pkcs12.o", ], - "test\\buildtest_kdf" => + "test\\buildtest_c_pkcs7" => [ - "test\\buildtest_kdf.o", + "test\\buildtest_pkcs7.o", ], - "test\\buildtest_kdf.o" => + "test\\buildtest_c_rand" => [ - "test\\buildtest_kdf.c", + "test\\buildtest_rand.o", ], - "test\\buildtest_lhash" => + "test\\buildtest_c_rand_drbg" => [ - "test\\buildtest_lhash.o", + "test\\buildtest_rand_drbg.o", ], - "test\\buildtest_lhash.o" => + "test\\buildtest_c_rc2" => [ - "test\\buildtest_lhash.c", + "test\\buildtest_rc2.o", ], - "test\\buildtest_md2" => + "test\\buildtest_c_rc4" => [ - "test\\buildtest_md2.o", + "test\\buildtest_rc4.o", ], - "test\\buildtest_md2.o" => + "test\\buildtest_c_rc5" => [ - "test\\buildtest_md2.c", + "test\\buildtest_rc5.o", ], - "test\\buildtest_md4" => + "test\\buildtest_c_ripemd" => [ - "test\\buildtest_md4.o", + "test\\buildtest_ripemd.o", ], - "test\\buildtest_md4.o" => + "test\\buildtest_c_rsa" => [ - "test\\buildtest_md4.c", + "test\\buildtest_rsa.o", ], - "test\\buildtest_md5" => + "test\\buildtest_c_safestack" => [ - "test\\buildtest_md5.o", + "test\\buildtest_safestack.o", ], - "test\\buildtest_md5.o" => + "test\\buildtest_c_seed" => [ - "test\\buildtest_md5.c", + "test\\buildtest_seed.o", ], - "test\\buildtest_modes" => + "test\\buildtest_c_sha" => [ - "test\\buildtest_modes.o", + "test\\buildtest_sha.o", ], - "test\\buildtest_modes.o" => + "test\\buildtest_c_srp" => [ - "test\\buildtest_modes.c", + "test\\buildtest_srp.o", ], - "test\\buildtest_obj_mac" => + "test\\buildtest_c_srtp" => [ - "test\\buildtest_obj_mac.o", + "test\\buildtest_srtp.o", ], - "test\\buildtest_obj_mac.o" => + "test\\buildtest_c_ssl" => [ - "test\\buildtest_obj_mac.c", + "test\\buildtest_ssl.o", ], - "test\\buildtest_objects" => + "test\\buildtest_c_ssl2" => [ - "test\\buildtest_objects.o", + "test\\buildtest_ssl2.o", ], - "test\\buildtest_objects.o" => + "test\\buildtest_c_ssl3" => [ - "test\\buildtest_objects.c", + "test\\buildtest_ssl3.o", ], - "test\\buildtest_ocsp" => + "test\\buildtest_c_stack" => [ - "test\\buildtest_ocsp.o", + "test\\buildtest_stack.o", ], - "test\\buildtest_ocsp.o" => + "test\\buildtest_c_store" => [ - "test\\buildtest_ocsp.c", + "test\\buildtest_store.o", ], - "test\\buildtest_opensslv" => + "test\\buildtest_c_symhacks" => [ - "test\\buildtest_opensslv.o", + "test\\buildtest_symhacks.o", ], - "test\\buildtest_opensslv.o" => + "test\\buildtest_c_tls1" => [ - "test\\buildtest_opensslv.c", + "test\\buildtest_tls1.o", ], - "test\\buildtest_ossl_typ" => + "test\\buildtest_c_ts" => [ - "test\\buildtest_ossl_typ.o", + "test\\buildtest_ts.o", ], - "test\\buildtest_ossl_typ.o" => + "test\\buildtest_c_txt_db" => [ - "test\\buildtest_ossl_typ.c", + "test\\buildtest_txt_db.o", ], - "test\\buildtest_pem" => + "test\\buildtest_c_ui" => [ - "test\\buildtest_pem.o", + "test\\buildtest_ui.o", ], - "test\\buildtest_pem.o" => + "test\\buildtest_c_whrlpool" => [ - "test\\buildtest_pem.c", + "test\\buildtest_whrlpool.o", ], - "test\\buildtest_pem2" => + "test\\buildtest_c_x509" => [ - "test\\buildtest_pem2.o", + "test\\buildtest_x509.o", ], - "test\\buildtest_pem2.o" => + "test\\buildtest_c_x509_vfy" => [ - "test\\buildtest_pem2.c", + "test\\buildtest_x509_vfy.o", ], - "test\\buildtest_pkcs12" => + "test\\buildtest_c_x509v3" => [ - "test\\buildtest_pkcs12.o", + "test\\buildtest_x509v3.o", ], - "test\\buildtest_pkcs12.o" => + "test\\buildtest_camellia.o" => [ - "test\\buildtest_pkcs12.c", + "test\\buildtest_camellia.c", ], - "test\\buildtest_pkcs7" => + "test\\buildtest_cast.o" => [ - "test\\buildtest_pkcs7.o", + "test\\buildtest_cast.c", ], - "test\\buildtest_pkcs7.o" => + "test\\buildtest_cmac.o" => [ - "test\\buildtest_pkcs7.c", + "test\\buildtest_cmac.c", ], - "test\\buildtest_rand" => + "test\\buildtest_cms.o" => [ - "test\\buildtest_rand.o", + "test\\buildtest_cms.c", ], - "test\\buildtest_rand.o" => + "test\\buildtest_comp.o" => [ - "test\\buildtest_rand.c", + "test\\buildtest_comp.c", ], - "test\\buildtest_rand_drbg" => + "test\\buildtest_conf.o" => [ - "test\\buildtest_rand_drbg.o", + "test\\buildtest_conf.c", ], - "test\\buildtest_rand_drbg.o" => + "test\\buildtest_conf_api.o" => [ - "test\\buildtest_rand_drbg.c", + "test\\buildtest_conf_api.c", ], - "test\\buildtest_rc2" => + "test\\buildtest_crypto.o" => [ - "test\\buildtest_rc2.o", + "test\\buildtest_crypto.c", ], - "test\\buildtest_rc2.o" => + "test\\buildtest_ct.o" => [ - "test\\buildtest_rc2.c", + "test\\buildtest_ct.c", ], - "test\\buildtest_rc4" => + "test\\buildtest_des.o" => [ - "test\\buildtest_rc4.o", + "test\\buildtest_des.c", ], - "test\\buildtest_rc4.o" => + "test\\buildtest_dh.o" => [ - "test\\buildtest_rc4.c", + "test\\buildtest_dh.c", ], - "test\\buildtest_rc5" => + "test\\buildtest_dsa.o" => [ - "test\\buildtest_rc5.o", + "test\\buildtest_dsa.c", ], - "test\\buildtest_rc5.o" => + "test\\buildtest_dtls1.o" => [ - "test\\buildtest_rc5.c", + "test\\buildtest_dtls1.c", ], - "test\\buildtest_ripemd" => + "test\\buildtest_e_os2.o" => [ - "test\\buildtest_ripemd.o", + "test\\buildtest_e_os2.c", ], - "test\\buildtest_ripemd.o" => + "test\\buildtest_ebcdic.o" => [ - "test\\buildtest_ripemd.c", + "test\\buildtest_ebcdic.c", ], - "test\\buildtest_rsa" => + "test\\buildtest_ec.o" => [ - "test\\buildtest_rsa.o", + "test\\buildtest_ec.c", ], - "test\\buildtest_rsa.o" => + "test\\buildtest_ecdh.o" => [ - "test\\buildtest_rsa.c", + "test\\buildtest_ecdh.c", ], - "test\\buildtest_safestack" => + "test\\buildtest_ecdsa.o" => [ - "test\\buildtest_safestack.o", + "test\\buildtest_ecdsa.c", ], - "test\\buildtest_safestack.o" => + "test\\buildtest_engine.o" => [ - "test\\buildtest_safestack.c", + "test\\buildtest_engine.c", ], - "test\\buildtest_seed" => + "test\\buildtest_evp.o" => [ - "test\\buildtest_seed.o", + "test\\buildtest_evp.c", ], - "test\\buildtest_seed.o" => + "test\\buildtest_hmac.o" => [ - "test\\buildtest_seed.c", + "test\\buildtest_hmac.c", ], - "test\\buildtest_sha" => + "test\\buildtest_idea.o" => [ - "test\\buildtest_sha.o", + "test\\buildtest_idea.c", ], - "test\\buildtest_sha.o" => + "test\\buildtest_kdf.o" => [ - "test\\buildtest_sha.c", + "test\\buildtest_kdf.c", ], - "test\\buildtest_srp" => + "test\\buildtest_lhash.o" => [ - "test\\buildtest_srp.o", + "test\\buildtest_lhash.c", ], - "test\\buildtest_srp.o" => + "test\\buildtest_md2.o" => [ - "test\\buildtest_srp.c", + "test\\buildtest_md2.c", ], - "test\\buildtest_srtp" => + "test\\buildtest_md4.o" => [ - "test\\buildtest_srtp.o", + "test\\buildtest_md4.c", ], - "test\\buildtest_srtp.o" => + "test\\buildtest_md5.o" => [ - "test\\buildtest_srtp.c", + "test\\buildtest_md5.c", ], - "test\\buildtest_ssl" => + "test\\buildtest_modes.o" => [ - "test\\buildtest_ssl.o", + "test\\buildtest_modes.c", ], - "test\\buildtest_ssl.o" => + "test\\buildtest_obj_mac.o" => [ - "test\\buildtest_ssl.c", + "test\\buildtest_obj_mac.c", ], - "test\\buildtest_ssl2" => + "test\\buildtest_objects.o" => [ - "test\\buildtest_ssl2.o", + "test\\buildtest_objects.c", ], - "test\\buildtest_ssl2.o" => + "test\\buildtest_ocsp.o" => [ - "test\\buildtest_ssl2.c", + "test\\buildtest_ocsp.c", + ], + "test\\buildtest_opensslv.o" => + [ + "test\\buildtest_opensslv.c", ], - "test\\buildtest_ssl3" => + "test\\buildtest_ossl_typ.o" => [ - "test\\buildtest_ssl3.o", + "test\\buildtest_ossl_typ.c", ], - "test\\buildtest_ssl3.o" => + "test\\buildtest_pem.o" => [ - "test\\buildtest_ssl3.c", + "test\\buildtest_pem.c", ], - "test\\buildtest_stack" => + "test\\buildtest_pem2.o" => [ - "test\\buildtest_stack.o", + "test\\buildtest_pem2.c", ], - "test\\buildtest_stack.o" => + "test\\buildtest_pkcs12.o" => [ - "test\\buildtest_stack.c", + "test\\buildtest_pkcs12.c", ], - "test\\buildtest_store" => + "test\\buildtest_pkcs7.o" => [ - "test\\buildtest_store.o", + "test\\buildtest_pkcs7.c", ], - "test\\buildtest_store.o" => + "test\\buildtest_rand.o" => [ - "test\\buildtest_store.c", + "test\\buildtest_rand.c", ], - "test\\buildtest_symhacks" => + "test\\buildtest_rand_drbg.o" => [ - "test\\buildtest_symhacks.o", + "test\\buildtest_rand_drbg.c", ], - "test\\buildtest_symhacks.o" => + "test\\buildtest_rc2.o" => [ - "test\\buildtest_symhacks.c", + "test\\buildtest_rc2.c", ], - "test\\buildtest_tls1" => + "test\\buildtest_rc4.o" => [ - "test\\buildtest_tls1.o", + "test\\buildtest_rc4.c", ], - "test\\buildtest_tls1.o" => + "test\\buildtest_rc5.o" => [ - "test\\buildtest_tls1.c", + "test\\buildtest_rc5.c", ], - "test\\buildtest_ts" => + "test\\buildtest_ripemd.o" => [ - "test\\buildtest_ts.o", + "test\\buildtest_ripemd.c", ], - "test\\buildtest_ts.o" => + "test\\buildtest_rsa.o" => [ - "test\\buildtest_ts.c", + "test\\buildtest_rsa.c", ], - "test\\buildtest_txt_db" => + "test\\buildtest_safestack.o" => [ - "test\\buildtest_txt_db.o", + "test\\buildtest_safestack.c", ], - "test\\buildtest_txt_db.o" => + "test\\buildtest_seed.o" => [ - "test\\buildtest_txt_db.c", + "test\\buildtest_seed.c", ], - "test\\buildtest_ui" => + "test\\buildtest_sha.o" => [ - "test\\buildtest_ui.o", + "test\\buildtest_sha.c", ], - "test\\buildtest_ui.o" => + "test\\buildtest_srp.o" => [ - "test\\buildtest_ui.c", + "test\\buildtest_srp.c", ], - "test\\buildtest_whrlpool" => + "test\\buildtest_srtp.o" => [ - "test\\buildtest_whrlpool.o", + "test\\buildtest_srtp.c", ], - "test\\buildtest_whrlpool.o" => + "test\\buildtest_ssl.o" => [ - "test\\buildtest_whrlpool.c", + "test\\buildtest_ssl.c", ], - "test\\buildtest_x509" => + "test\\buildtest_ssl2.o" => [ - "test\\buildtest_x509.o", + "test\\buildtest_ssl2.c", ], - "test\\buildtest_x509.o" => + "test\\buildtest_ssl3.o" => [ - "test\\buildtest_x509.c", + "test\\buildtest_ssl3.c", ], - "test\\buildtest_x509_vfy" => + "test\\buildtest_stack.o" => [ - "test\\buildtest_x509_vfy.o", + "test\\buildtest_stack.c", ], - "test\\buildtest_x509_vfy.o" => + "test\\buildtest_store.o" => [ - "test\\buildtest_x509_vfy.c", + "test\\buildtest_store.c", ], - "test\\buildtest_x509v3" => + "test\\buildtest_symhacks.o" => [ - "test\\buildtest_x509v3.o", + "test\\buildtest_symhacks.c", + ], + "test\\buildtest_tls1.o" => + [ + "test\\buildtest_tls1.c", + ], + "test\\buildtest_ts.o" => + [ + "test\\buildtest_ts.c", + ], + "test\\buildtest_txt_db.o" => + [ + "test\\buildtest_txt_db.c", + ], + "test\\buildtest_ui.o" => + [ + "test\\buildtest_ui.c", + ], + "test\\buildtest_whrlpool.o" => + [ + "test\\buildtest_whrlpool.c", + ], + "test\\buildtest_x509.o" => + [ + "test\\buildtest_x509.c", + ], + "test\\buildtest_x509_vfy.o" => + [ + "test\\buildtest_x509_vfy.c", ], "test\\buildtest_x509v3.o" => [ @@ -17666,6 +17719,14 @@ our %unified_info = ( [ "..\\test\\dtlsv1listentest.c", ], + "test\\ec_internal_test" => + [ + "test\\ec_internal_test.o", + ], + "test\\ec_internal_test.o" => + [ + "..\\test\\ec_internal_test.c", + ], "test\\ecdsatest" => [ "test\\ecdsatest.o", @@ -18552,9 +18613,9 @@ _____ if ($reconf) { if ($verbose) { print 'Reconfiguring with: ', join(' ',@{$config{perlargv}}), "\n"; - foreach (sort keys %{$config{perlenv}}) { - print ' ',$_,' = ',($config{perlenv}->{$_} || ""),"\n"; - } + foreach (sort keys %{$config{perlenv}}) { + print ' ',$_,' = ',($config{perlenv}->{$_} || ""),"\n"; + } } chdir $here; -- cgit v1.1