|
@@ -1,13 +1,11 @@
|
|
|
|
|
|
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
|
|
|
|
|
@@ -83,24 +81,6 @@ LIBOR_A_SRC = \
|
|
|
src/common/src_common_libor_testing_a-log.$(OBJEXT) \
|
|
|
src/common/log.$(OBJEXT): micro-revision.i
|
|
|
|
|
|
-LIBOR_CRYPTO_A_SRC = \
|
|
|
- src/common/aes.c \
|
|
|
- src/common/buffers_tls.c \
|
|
|
- src/common/crypto.c \
|
|
|
- src/common/crypto_dh.c \
|
|
|
- src/common/crypto_digest.c \
|
|
|
- src/common/crypto_format.c \
|
|
|
- src/common/crypto_hkdf.c \
|
|
|
- src/common/crypto_openssl_mgt.c \
|
|
|
- src/common/crypto_pwbox.c \
|
|
|
- src/common/crypto_rand.c \
|
|
|
- src/common/crypto_rsa.c \
|
|
|
- src/common/crypto_s2k.c \
|
|
|
- src/common/crypto_util.c \
|
|
|
- src/common/tortls.c \
|
|
|
- src/common/crypto_curve25519.c \
|
|
|
- src/common/crypto_ed25519.c
|
|
|
-
|
|
|
LIBOR_EVENT_A_SRC = \
|
|
|
src/common/compat_libevent.c \
|
|
|
src/common/procmon.c \
|
|
@@ -108,53 +88,31 @@ LIBOR_EVENT_A_SRC = \
|
|
|
src/ext/timeouts/timeout.c
|
|
|
|
|
|
src_common_libor_a_SOURCES = $(LIBOR_A_SRC)
|
|
|
-src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
|
|
|
src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC)
|
|
|
|
|
|
if UNITTESTS_ENABLED
|
|
|
src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC)
|
|
|
-src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
|
|
|
src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC)
|
|
|
else
|
|
|
src_common_libor_testing_a_SOURCES =
|
|
|
-src_common_libor_crypto_testing_a_SOURCES =
|
|
|
src_common_libor_event_testing_a_SOURCES =
|
|
|
endif
|
|
|
|
|
|
src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
|
|
-src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
|
|
src_common_libor_event_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_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/address_set.h \
|
|
|
src/common/buffers.h \
|
|
|
- src/common/buffers_tls.h \
|
|
|
- src/common/aes.h \
|
|
|
- src/common/ciphers.inc \
|
|
|
src/common/compat.h \
|
|
|
src/common/compat_libevent.h \
|
|
|
- src/common/compat_openssl.h \
|
|
|
src/common/compat_threads.h \
|
|
|
src/common/compat_time.h \
|
|
|
src/common/confline.h \
|
|
|
src/common/container.h \
|
|
|
- src/common/crypto.h \
|
|
|
- src/common/crypto_dh.h \
|
|
|
- src/common/crypto_digest.h \
|
|
|
- src/common/crypto_curve25519.h \
|
|
|
- src/common/crypto_ed25519.h \
|
|
|
- src/common/crypto_format.h \
|
|
|
- src/common/crypto_hkdf.h \
|
|
|
- src/common/crypto_openssl_mgt.h \
|
|
|
- src/common/crypto_pwbox.h \
|
|
|
- src/common/crypto_rand.h \
|
|
|
- src/common/crypto_rsa.h \
|
|
|
- src/common/crypto_s2k.h \
|
|
|
- src/common/crypto_util.h \
|
|
|
src/common/handles.h \
|
|
|
src/common/memarea.h \
|
|
|
src/common/linux_syscalls.inc \
|
|
@@ -165,7 +123,6 @@ COMMONHEADERS = \
|
|
|
src/common/timers.h \
|
|
|
src/common/token_bucket.h \
|
|
|
src/common/torlog.h \
|
|
|
- src/common/tortls.h \
|
|
|
src/common/util.h \
|
|
|
src/common/util_bug.h \
|
|
|
src/common/util_format.h \
|