diff options
Diffstat (limited to 'upstream-build/configdata.pm/i686-linux')
| -rw-r--r-- | upstream-build/configdata.pm/i686-linux | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/upstream-build/configdata.pm/i686-linux b/upstream-build/configdata.pm/i686-linux index d67aff2..c0b6a4f 100644 --- a/upstream-build/configdata.pm/i686-linux +++ b/upstream-build/configdata.pm/i686-linux @@ -60,11 +60,11 @@ our %config = ( openssl_sys_defines => [ ], 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-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 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 => "i386-linux-thread-multi", perl_cmd => "/usr/bin/perl", perl_version => "5.24.3", - perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], + perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1g", - version_num => "0x1010107fL", + version => "1.1.1i", + version_num => "0x1010109fL", ); our %target = ( @@ -150,7 +150,7 @@ our %target = ( cpuid_asm_src => "mem_clr.c", cpuid_obj => "mem_clr.o", cxxflags => "-std=c++11 -pthread -m32", - defines => [ ], + defines => [ "ZLIB" ], des_asm_src => "des_enc.c fcrypt_b.c", des_obj => "des_enc.o fcrypt_b.o", disable => [ ], @@ -159,7 +159,7 @@ our %target = ( ec_asm_src => "", ec_obj => "", enable => [ "afalgeng" ], - ex_libs => "-ldl -pthread", + ex_libs => "-lz -ldl -pthread", exe_extension => "", includes => [ ], keccak1600_asm_src => "keccak1600.c", @@ -338,7 +338,6 @@ our %disabled = ( "ssl-trace" => "default", "ubsan" => "default", "unit-test" => "default", - "zlib" => "default", "zlib-dynamic" => "default", ); @@ -1212,6 +1211,11 @@ our %unified_info = ( "libssl", "test/libtestutil.a", ], + "test/cmactest" => + [ + "libcrypto.a", + "test/libtestutil.a", + ], "test/cmsapitest" => [ "libcrypto", @@ -3204,8 +3208,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3235,6 +3237,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -10733,6 +10737,13 @@ our %unified_info = ( "include", "../include", ], + "test/cmactest.o" => + [ + "include", + "apps/include", + "../include", + "../apps/include", + ], "test/cmsapitest.o" => [ "include", @@ -11458,6 +11469,7 @@ our %unified_info = ( "test/cipherlist_test", "test/ciphername_test", "test/clienthellotest", + "test/cmactest", "test/cmsapitest", "test/conf_include_test", "test/constant_time_test", @@ -16213,6 +16225,14 @@ our %unified_info = ( [ "../test/clienthellotest.c", ], + "test/cmactest" => + [ + "test/cmactest.o", + ], + "test/cmactest.o" => + [ + "../test/cmactest.c", + ], "test/cmsapitest" => [ "test/cmsapitest.o", |