Commit a403ee6b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Move consttime library code into its own directory.

parent 275aff69

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ uptime-*.json 
/src/ext/keccak-tiny/libkeccak-tiny.lib



# /src/lib

/src/lib/libtor-ctime.a

/src/lib/libtor-ctime-testing.a

/src/lib/libtor-err.a

/src/lib/libtor-err-testing.a

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ endif 
TOR_UTIL_LIBS = \

	src/common/libor.a \

        src/lib/libtor-err.a \

	src/common/libor-ctime.a

	src/lib/libtor-ctime.a



# Variants of the above for linking the testing variant of tor (for coverage

# and tests)

TOR_UTIL_TESTING_LIBS = \

	src/common/libor-testing.a \

        src/lib/libtor-err-testing.a \

	src/common/libor-ctime-testing.a

        src/lib/libtor-ctime-testing.a



# Internal crypto libraries used in Tor

TOR_CRYPTO_LIBS = \

src/common/include.am

+0 −23
Original line number Diff line number Diff line 


noinst_LIBRARIES += \

	src/common/libor.a \

	src/common/libor-ctime.a \

	src/common/libor-crypto.a \

	src/common/libor-event.a



if UNITTESTS_ENABLED

noinst_LIBRARIES += \

	src/common/libor-testing.a \

	src/common/libor-ctime-testing.a \

	src/common/libor-crypto-testing.a \

	src/common/libor-event-testing.a

endif
@@ -59,26 +57,6 @@ else 
readpassphrase_source=

endif



if ADD_MULODI4

mulodi4_source=src/ext/mulodi/mulodi4.c

else

mulodi4_source=

endif



LIBOR_CTIME_A_SRC = \

   $(mulodi4_source) \

   src/ext/csiphash.c   \

   src/common/di_ops.c



src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC)

if UNITTESTS_ENABLED

src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC)

else

src_common_libor_ctime_testing_a_SOURCES =

endif

src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@

src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS)



LIBOR_A_SRC = \

  src/common/address.c					\

  src/common/address_set.c				\
@@ -189,7 +167,6 @@ COMMONHEADERS = \ 
  src/common/crypto_rsa.h           \

  src/common/crypto_s2k.h			\

  src/common/crypto_util.h			\

  src/common/di_ops.h				\

  src/common/handles.h				\

  src/common/memarea.h				\

  src/common/linux_syscalls.inc			\

src/include.am

+1 −0
Original line number Diff line number Diff line 
include src/ext/include.am

include src/lib/err/include.am

include src/lib/ctime/include.am

include src/common/include.am

include src/trunnel/include.am

include src/or/include.am

src/common/di_ops.c→src/lib/ctime/di_ops.c

+0 −0

File moved.

View file