mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-27 07:59:35 +01:00
909aa51b3f
By now, support in the network is widespread and it's time to require more modern crypto on all Tor instances, whether they're clients or servers. By doing this early in 0.2.6, we can be sure that at some point all clients will have reasonable support.
148 lines
4.3 KiB
Text
148 lines
4.3 KiB
Text
|
|
noinst_LIBRARIES += \
|
|
src/common/libor.a \
|
|
src/common/libor-crypto.a \
|
|
src/common/libor-event.a
|
|
|
|
if UNITTESTS_ENABLED
|
|
noinst_LIBRARIES += \
|
|
src/common/libor-testing.a \
|
|
src/common/libor-crypto-testing.a \
|
|
src/common/libor-event-testing.a
|
|
endif
|
|
|
|
EXTRA_DIST+= \
|
|
src/common/common_sha1.i \
|
|
src/common/Makefile.nmake
|
|
|
|
#CFLAGS = -Wall -Wpointer-arith -O2
|
|
AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel
|
|
|
|
if USE_OPENBSD_MALLOC
|
|
libor_extra_source=src/ext/OpenBSD_malloc_Linux.c
|
|
else
|
|
libor_extra_source=
|
|
endif
|
|
|
|
if USE_MEMPOOLS
|
|
libor_mempool_source=src/common/mempool.c
|
|
libor_mempool_header=src/common/mempool.h
|
|
else
|
|
libor_mempool_source=
|
|
libor_mempool_header=
|
|
endif
|
|
|
|
src_common_libcurve25519_donna_a_CFLAGS=
|
|
|
|
if BUILD_CURVE25519_DONNA
|
|
src_common_libcurve25519_donna_a_SOURCES=\
|
|
src/ext/curve25519_donna/curve25519-donna.c
|
|
src_common_libcurve25519_donna_a_CFLAGS+=\
|
|
@F_OMIT_FRAME_POINTER@
|
|
noinst_LIBRARIES+=src/common/libcurve25519_donna.a
|
|
LIBDONNA=src/common/libcurve25519_donna.a
|
|
else
|
|
if BUILD_CURVE25519_DONNA_C64
|
|
src_common_libcurve25519_donna_a_SOURCES=\
|
|
src/ext/curve25519_donna/curve25519-donna-c64.c
|
|
noinst_LIBRARIES+=src/common/libcurve25519_donna.a
|
|
LIBDONNA=src/common/libcurve25519_donna.a
|
|
else
|
|
LIBDONNA=
|
|
endif
|
|
endif
|
|
|
|
LIBDONNA += $(LIBED25519_REF10)
|
|
|
|
LIBOR_A_SOURCES = \
|
|
src/common/address.c \
|
|
src/common/backtrace.c \
|
|
src/common/compat.c \
|
|
src/common/container.c \
|
|
src/common/di_ops.c \
|
|
src/common/log.c \
|
|
src/common/memarea.c \
|
|
src/common/util.c \
|
|
src/common/util_codedigest.c \
|
|
src/common/util_process.c \
|
|
src/common/sandbox.c \
|
|
src/ext/csiphash.c \
|
|
src/ext/trunnel/trunnel.c \
|
|
$(libor_extra_source) \
|
|
$(libor_mempool_source)
|
|
|
|
LIBOR_CRYPTO_A_SOURCES = \
|
|
src/common/aes.c \
|
|
src/common/crypto.c \
|
|
src/common/crypto_pwbox.c \
|
|
src/common/crypto_s2k.c \
|
|
src/common/crypto_format.c \
|
|
src/common/torgzip.c \
|
|
src/common/tortls.c \
|
|
src/trunnel/pwbox.c \
|
|
src/common/crypto_curve25519.c \
|
|
src/common/crypto_ed25519.c
|
|
|
|
LIBOR_EVENT_A_SOURCES = \
|
|
src/common/compat_libevent.c \
|
|
src/common/procmon.c
|
|
|
|
src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES)
|
|
src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES)
|
|
src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SOURCES)
|
|
|
|
src_common_libor_testing_a_SOURCES = $(LIBOR_A_SOURCES)
|
|
src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES)
|
|
src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SOURCES)
|
|
|
|
src_common_libor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS)
|
|
src_common_libor_crypto_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS)
|
|
src_common_libor_event_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS)
|
|
src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
|
src_common_libor_crypto_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
|
src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
|
|
|
|
|
COMMONHEADERS = \
|
|
src/common/address.h \
|
|
src/common/backtrace.h \
|
|
src/common/aes.h \
|
|
src/common/ciphers.inc \
|
|
src/common/compat.h \
|
|
src/common/compat_libevent.h \
|
|
src/common/container.h \
|
|
src/common/crypto.h \
|
|
src/common/crypto_curve25519.h \
|
|
src/common/crypto_ed25519.h \
|
|
src/common/crypto_pwbox.h \
|
|
src/common/crypto_s2k.h \
|
|
src/common/di_ops.h \
|
|
src/common/memarea.h \
|
|
src/common/linux_syscalls.inc \
|
|
src/common/procmon.h \
|
|
src/common/sandbox.h \
|
|
src/common/testsupport.h \
|
|
src/common/torgzip.h \
|
|
src/common/torint.h \
|
|
src/common/torlog.h \
|
|
src/common/tortls.h \
|
|
src/common/util.h \
|
|
src/common/util_process.h \
|
|
$(libor_mempool_header)
|
|
|
|
noinst_HEADERS+= $(COMMONHEADERS)
|
|
|
|
DISTCLEANFILES+= src/common/common_sha1.i
|
|
|
|
src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEADERS)
|
|
$(AM_V_GEN)if test "@SHA1SUM@" != none; then \
|
|
(cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > $@; \
|
|
elif test "@OPENSSL@" != none; then \
|
|
(cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > $@; \
|
|
else \
|
|
rm $@; \
|
|
touch $@; \
|
|
fi
|
|
|
|
src/common/util_codedigest.o: src/common/common_sha1.i
|
|
|