diff options
Diffstat (limited to 'upstream-build/configdata.pm/i686-win32-msvc')
| -rw-r--r-- | upstream-build/configdata.pm/i686-win32-msvc | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc index 8dc820f..28d45fb 100644 --- a/upstream-build/configdata.pm/i686-win32-msvc +++ b/upstream-build/configdata.pm/i686-win32-msvc @@ -63,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-afalgeng 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", + options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib --with-zlib-lib=c:\\zlib32\\lib\\z.dll.lib --with-zlib-include=c:\\zlib32\\include no-afalgeng 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-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", "no-devcryptoeng" ], + perl_version => "5.28.1", + perlargv => [ "VC-WIN32", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib", "--with-zlib-lib=c:\\zlib32\\lib\\z.dll.lib", "--with-zlib-include=c:\\zlib32\\include" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -115,8 +115,8 @@ our %config = ( sourcedir => "..", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1g", - version_num => "0x1010107fL", + version => "1.1.1i", + version_num => "0x1010109fL", ); our %target = ( @@ -132,7 +132,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x65d9b8)", + RANLIB => "CODE(0xe44e20)", 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", @@ -163,7 +163,7 @@ our %target = ( cppflags => "", cpuid_asm_src => "mem_clr.c", cpuid_obj => "mem_clr.o", - defines => [ "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS", "OPENSSL_USE_APPLINK" ], + defines => [ "ZLIB", "OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_DEPRECATE", "_WINSOCK_DEPRECATED_NO_WARNINGS", "OPENSSL_USE_APPLINK" ], des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", disable => [ ], @@ -173,9 +173,9 @@ our %target = ( ec_asm_src => "", ec_obj => "", enable => [ ], - ex_libs => "ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", + ex_libs => "c:\\zlib32\\lib\\z.dll.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib", exe_extension => "", - includes => [ ], + includes => [ "c:\\zlib32\\include" ], keccak1600_asm_src => "keccak1600.c", keccak1600_obj => "keccak1600.o", ldoutflag => "/out:", @@ -356,11 +356,12 @@ our %disabled = ( "ssl-trace" => "default", "ubsan" => "default", "unit-test" => "default", - "zlib" => "default", "zlib-dynamic" => "default", ); our %withargs = ( + zlib_include => "c:\\zlib32\\include", + zlib_lib => "c:\\zlib32\\lib\\z.dll.lib", ); our %unified_info = ( @@ -1226,6 +1227,11 @@ our %unified_info = ( "libssl", "test\\libtestutil.a", ], + "test\\cmactest" => + [ + "libcrypto.a", + "test\\libtestutil.a", + ], "test\\cmsapitest" => [ "libcrypto", @@ -3218,9 +3224,9 @@ our %unified_info = ( { "deps" => [ - "ms\\uplink.o", "ms\\applink.o", "ms\\applink.o", + "ms\\uplink.o", ], "products" => { @@ -3239,6 +3245,8 @@ our %unified_info = ( { "deps" => [ + "ssl\\packet.o", + "ssl\\tls13_enc.o", "ssl\\bio_ssl.o", "ssl\\d1_lib.o", "ssl\\d1_msg.o", @@ -3268,8 +3276,6 @@ our %unified_info = ( "ssl\\t1_trce.o", "ssl\\tls13_enc.o", "ssl\\tls_srp.o", - "ssl\\packet.o", - "ssl\\tls13_enc.o", ], "products" => { @@ -10016,12 +10022,12 @@ our %unified_info = ( ], "ms\\applink.o" => [ - "apps", ".", "include", - "..\\apps", + "apps", "..", "..\\include", + "..\\apps", ], "ms\\uplink.o" => [ @@ -10807,6 +10813,13 @@ our %unified_info = ( "include", "..\\include", ], + "test\\cmactest.o" => + [ + "include", + "apps\\include", + "..\\include", + "..\\apps\\include", + ], "test\\cmsapitest.o" => [ "include", @@ -11531,6 +11544,7 @@ our %unified_info = ( "test\\cipherlist_test", "test\\ciphername_test", "test\\clienthellotest", + "test\\cmactest", "test\\cmsapitest", "test\\conf_include_test", "test\\constant_time_test", @@ -16281,6 +16295,14 @@ our %unified_info = ( [ "..\\test\\clienthellotest.c", ], + "test\\cmactest" => + [ + "test\\cmactest.o", + ], + "test\\cmactest.o" => + [ + "..\\test\\cmactest.c", + ], "test\\cmsapitest" => [ "test\\cmsapitest.o", |