commit 8918bd90e9ddc135c0519177a07cd7a8c18859ed Merge: 471418bef 3305ae504 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 13:57:13 2018 -0400
Merge branch 'extract_easy_common_libs'
.gitignore | 13 +- Makefile.am | 14 +- src/common/address.h | 2 +- src/common/address_set.c | 2 +- src/common/address_set.h | 2 +- src/common/buffers.c | 4 +- src/common/buffers.h | 4 +- src/common/compat.h | 54 +------ src/common/compat_libevent.c | 2 +- src/common/compat_libevent.h | 2 +- src/common/compat_threads.h | 4 +- src/common/container.c | 2 +- src/common/include.am | 83 ---------- src/common/pubsub.c | 129 --------------- src/common/pubsub.h | 179 --------------------- src/common/sandbox.c | 2 +- src/common/sandbox.h | 2 +- src/common/timers.h | 2 +- src/common/token_bucket.h | 4 +- src/common/torlog.h | 2 +- src/common/util.c | 4 +- src/common/util.h | 4 +- src/common/util_bug.h | 2 +- src/common/util_format.c | 2 +- src/common/util_format.h | 4 +- src/common/workqueue.c | 2 +- src/ext/OpenBSD_malloc_Linux.c | 2 +- src/ext/csiphash.c | 2 +- src/ext/curve25519_donna/curve25519-donna-c64.c | 2 +- src/ext/curve25519_donna/curve25519-donna.c | 2 +- src/ext/ed25519/donna/ed25519-hash-custom.h | 2 +- src/ext/ed25519/donna/ed25519-randombytes-custom.h | 2 +- src/ext/ed25519/donna/ed25519_donna_tor.h | 2 +- src/ext/ed25519/donna/ed25519_tor.c | 2 +- src/ext/ed25519/ref10/blinding.c | 2 +- src/ext/ed25519/ref10/crypto_hash_sha512.h | 2 +- src/ext/ed25519/ref10/crypto_int32.h | 2 +- src/ext/ed25519/ref10/crypto_int64.h | 2 +- src/ext/ed25519/ref10/crypto_uint32.h | 2 +- src/ext/ed25519/ref10/crypto_uint64.h | 2 +- src/ext/ed25519/ref10/ed25519_ref10.h | 2 +- src/ext/ed25519/ref10/keypair.c | 4 +- src/ext/ed25519/ref10/randombytes.h | 2 +- src/ext/keccak-tiny/keccak-tiny-unrolled.c | 2 +- src/ext/keccak-tiny/keccak-tiny.h | 2 +- src/ext/mulodi/mulodi4.c | 2 +- src/include.am | 8 +- src/{common => lib/cc}/compat_compiler.h | 48 ++++++ src/lib/cc/include.am | 4 + src/{common => lib/cc}/torint.h | 0 src/{common => lib/compress}/compress.c | 12 +- src/{common => lib/compress}/compress.h | 0 src/{common => lib/compress}/compress_lzma.c | 4 +- src/{common => lib/compress}/compress_lzma.h | 0 src/{common => lib/compress}/compress_none.c | 4 +- src/{common => lib/compress}/compress_none.h | 0 src/{common => lib/compress}/compress_zlib.c | 4 +- src/{common => lib/compress}/compress_zlib.h | 0 src/{common => lib/compress}/compress_zstd.c | 4 +- src/{common => lib/compress}/compress_zstd.h | 0 src/lib/compress/include.am | 25 +++ src/{common => lib/crypt_ops}/aes.c | 6 +- src/{common => lib/crypt_ops}/aes.h | 0 src/{common => lib/crypt_ops}/compat_openssl.h | 2 +- src/{common => lib/crypt_ops}/crypto.c | 24 +-- src/{common => lib/crypt_ops}/crypto.h | 4 +- src/{common => lib/crypt_ops}/crypto_curve25519.c | 10 +- src/{common => lib/crypt_ops}/crypto_curve25519.h | 8 +- src/{common => lib/crypt_ops}/crypto_dh.c | 10 +- src/{common => lib/crypt_ops}/crypto_dh.h | 0 src/{common => lib/crypt_ops}/crypto_digest.c | 6 +- src/{common => lib/crypt_ops}/crypto_digest.h | 2 +- src/{common => lib/crypt_ops}/crypto_ed25519.c | 12 +- src/{common => lib/crypt_ops}/crypto_ed25519.h | 6 +- src/{common => lib/crypt_ops}/crypto_format.c | 10 +- src/{common => lib/crypt_ops}/crypto_format.h | 6 +- src/{common => lib/crypt_ops}/crypto_hkdf.c | 8 +- src/{common => lib/crypt_ops}/crypto_hkdf.h | 0 src/{common => lib/crypt_ops}/crypto_openssl_mgt.c | 4 +- src/{common => lib/crypt_ops}/crypto_openssl_mgt.h | 0 src/{common => lib/crypt_ops}/crypto_pwbox.c | 12 +- src/{common => lib/crypt_ops}/crypto_pwbox.h | 2 +- src/{common => lib/crypt_ops}/crypto_rand.c | 8 +- src/{common => lib/crypt_ops}/crypto_rand.h | 2 +- src/{common => lib/crypt_ops}/crypto_rsa.c | 16 +- src/{common => lib/crypt_ops}/crypto_rsa.h | 6 +- src/{common => lib/crypt_ops}/crypto_s2k.c | 12 +- src/{common => lib/crypt_ops}/crypto_s2k.h | 2 +- src/{common => lib/crypt_ops}/crypto_util.c | 2 +- src/{common => lib/crypt_ops}/crypto_util.h | 2 +- src/lib/crypt_ops/include.am | 44 +++++ src/lib/ctime/di_ops.c | 2 - src/lib/ctime/di_ops.h | 2 +- src/lib/err/backtrace.h | 2 +- src/lib/err/include.am | 2 + src/lib/err/torerr.h | 2 +- src/lib/include.libdonna.am | 24 +++ src/lib/testsupport/include.am | 3 + src/{common => lib/testsupport}/testsupport.h | 0 src/{common => lib/tls}/buffers_tls.c | 8 +- src/{common => lib/tls}/buffers_tls.h | 0 src/{common => lib/tls}/ciphers.inc | 0 src/lib/tls/include.am | 20 +++ src/{common => lib/tls}/tortls.c | 11 +- src/{common => lib/tls}/tortls.h | 6 +- src/{ => lib}/trace/debug.h | 0 src/{ => lib}/trace/events.h | 2 +- src/lib/trace/include.am | 18 +++ src/{ => lib}/trace/trace.c | 2 +- src/{ => lib}/trace/trace.h | 0 src/or/addressmap.c | 2 +- src/or/addressmap.h | 2 +- src/or/channelpadding.c | 2 +- src/or/circpathbias.c | 2 +- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +- src/or/circuitlist.h | 2 +- src/or/circuitmux.h | 2 +- src/or/circuitmux_ewma.c | 2 +- src/or/circuitstats.c | 2 +- src/or/command.c | 2 +- src/or/config.c | 6 +- src/or/config.h | 2 +- src/or/connection.c | 4 +- src/or/connection_edge.c | 2 +- src/or/connection_edge.h | 2 +- src/or/connection_or.c | 4 +- src/or/conscache.c | 2 +- src/or/control.c | 6 +- src/or/cpuworker.c | 4 +- src/or/dir_server_st.h | 2 +- src/or/dirauth/dircollate.h | 2 +- src/or/dirauth/shared_random.c | 4 +- src/or/dirauth/shared_random_state.c | 2 +- src/or/directory.c | 4 +- src/or/dirserv.h | 2 +- src/or/dns.c | 2 +- src/or/dos.c | 2 +- src/or/entry_port_cfg_st.h | 2 +- src/or/entrynodes.c | 2 +- src/or/ext_orport.c | 4 +- src/or/geoip.h | 2 +- src/or/hibernate.c | 2 +- src/or/hibernate.h | 2 +- src/or/hs_cache.c | 2 +- src/or/hs_cache.h | 2 +- src/or/hs_cell.c | 2 +- src/or/hs_circuit.c | 4 +- src/or/hs_circuit.h | 2 +- src/or/hs_client.c | 4 +- src/or/hs_client.h | 2 +- src/or/hs_common.c | 4 +- src/or/hs_control.c | 2 +- src/or/hs_descriptor.c | 4 +- src/or/hs_descriptor.h | 4 +- src/or/hs_ident.c | 2 +- src/or/hs_ident.h | 2 +- src/or/hs_intropoint.h | 2 +- src/or/hs_ntor.c | 2 +- src/or/hs_service.c | 4 +- src/or/hs_service.h | 4 +- src/or/keypin.c | 6 +- src/or/keypin.h | 2 +- src/or/main.c | 8 +- src/or/networkstatus.c | 4 +- src/or/networkstatus.h | 2 +- src/or/onion.c | 2 +- src/or/onion_fast.c | 4 +- src/or/onion_ntor.c | 8 +- src/or/onion_ntor.h | 4 +- src/or/onion_tap.c | 4 +- src/or/or.h | 18 +-- src/or/parsecommon.h | 2 +- src/or/proto_socks.c | 2 +- src/or/relay.c | 6 +- src/or/relay_crypto.c | 2 +- src/or/rendclient.c | 4 +- src/or/rendcommon.c | 4 +- src/or/rendmid.c | 2 +- src/or/rendservice.c | 4 +- src/or/rephist.c | 2 +- src/or/router.c | 6 +- src/or/router.h | 2 +- src/or/routerkeys.c | 4 +- src/or/routerkeys.h | 2 +- src/or/routerlist.c | 4 +- src/or/routerlist.h | 2 +- src/or/routerparse.c | 2 +- src/or/scheduler.h | 2 +- src/or/status.h | 2 +- src/or/torcert.c | 2 +- src/or/torcert.h | 2 +- src/rust/build.rs | 2 +- src/test/bench.c | 6 +- src/test/fuzz/fuzz_hsdescv3.c | 2 +- src/test/fuzz/fuzzing_common.c | 4 +- src/test/hs_test_helpers.c | 2 +- src/test/include.am | 1 - src/test/rend_test_helpers.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test-timers.c | 2 +- src/test/test.c | 8 +- src/test/test.h | 2 - src/test/test_addr.c | 2 +- src/test/test_address_set.c | 2 +- src/test/test_buffers.c | 4 +- src/test/test_cell_formats.c | 2 +- src/test/test_channel.c | 2 +- src/test/test_channelpadding.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_containers.c | 2 +- src/test/test_crypto.c | 8 +- src/test/test_crypto_openssl.c | 4 +- src/test/test_crypto_slow.c | 6 +- src/test/test_dir.c | 4 +- src/test/test_dir_handle_get.c | 2 +- src/test/test_dos.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_hs_cell.c | 4 +- src/test/test_hs_client.c | 2 +- src/test/test_hs_common.c | 2 +- src/test/test_hs_descriptor.c | 6 +- src/test/test_hs_intropoint.c | 2 +- src/test/test_hs_ntor_cl.c | 4 +- src/test/test_hs_service.c | 2 +- src/test/test_introduce.c | 2 +- src/test/test_nodelist.c | 2 +- src/test/test_ntor_cl.c | 4 +- src/test/test_oom.c | 2 +- src/test/test_pubsub.c | 85 ---------- src/test/test_relaycell.c | 2 +- src/test/test_relaycrypt.c | 2 +- src/test/test_router.c | 4 +- src/test/test_routerkeys.c | 2 +- src/test/test_routerlist.c | 2 +- src/test/test_shared_random.c | 2 +- src/test/test_storagedir.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util.c | 4 +- src/test/test_util_format.c | 2 +- src/test/test_util_slow.c | 2 +- src/test/test_workqueue.c | 4 +- src/test/testing_common.c | 2 +- src/test/testing_rsakeys.c | 2 +- src/tools/tor-gencert.c | 8 +- src/trace/include.am | 19 --- src/trunnel/trunnel-local.h | 2 +- 250 files changed, 595 insertions(+), 947 deletions(-)