nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move responsibility for libdonna out of src/common

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-21 13:04:09 -04:00
parent 71571e3428
commit e9943d5459
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -144,8 +144,6 @@ uptime-*.json
/src/common/libor-event.a /src/common/libor-event.a
/src/common/libor-event-testing.a /src/common/libor-event-testing.a
/src/common/libor-event.lib /src/common/libor-event.lib
/src/common/libcurve25519_donna.a
/src/common/libcurve25519_donna.lib
# /src/config/ # /src/config/
/src/config/Makefile /src/config/Makefile
@ -164,6 +162,7 @@ uptime-*.json
/src/ext/keccak-tiny/libkeccak-tiny.lib /src/ext/keccak-tiny/libkeccak-tiny.lib
# /src/lib # /src/lib
/src/lib/libcurve25519_donna.a
/src/lib/libtor-compress.a /src/lib/libtor-compress.a
/src/lib/libtor-compress-testing.a /src/lib/libtor-compress-testing.a
/src/lib/libtor-crypt-ops.a /src/lib/libtor-crypt-ops.a

25
src/common/include.am
View File

@ -17,31 +17,6 @@ else
libor_extra_source= libor_extra_source=
endif endif
src_common_libcurve25519_donna_a_CFLAGS=
if BUILD_CURVE25519_DONNA
src_common_libcurve25519_donna_a_SOURCES=\
src/ext/curve25519_donna/curve25519-donna.c
# See bug 13538 -- this code is known to have signed overflow issues.
src_common_libcurve25519_donna_a_CFLAGS+=\
@F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@
noinst_LIBRARIES+=src/common/libcurve25519_donna.a
LIBDONNA=src/common/libcurve25519_donna.a
else
if BUILD_CURVE25519_DONNA_C64
src_common_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@
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)
LIBDONNA += $(LIBED25519_DONNA)
if THREADS_PTHREADS if THREADS_PTHREADS
threads_impl_source=src/common/compat_pthreads.c threads_impl_source=src/common/compat_pthreads.c
endif endif

1
src/include.am
View File

@ -4,6 +4,7 @@ include src/lib/cc/include.am
include src/lib/ctime/include.am include src/lib/ctime/include.am
include src/lib/compress/include.am include src/lib/compress/include.am
include src/lib/crypt_ops/include.am include src/lib/crypt_ops/include.am
include src/lib/include.libdonna.am
include src/lib/tls/include.am include src/lib/tls/include.am
include src/lib/trace/include.am include src/lib/trace/include.am
include src/common/include.am include src/common/include.am

24
src/lib/include.libdonna.am Normal file
View File

@ -0,0 +1,24 @@
src_lib_libcurve25519_donna_a_CFLAGS=
if BUILD_CURVE25519_DONNA
src_lib_libcurve25519_donna_a_SOURCES=\
src/ext/curve25519_donna/curve25519-donna.c
# See bug 13538 -- this code is known to have signed overflow issues.
src_lib_libcurve25519_donna_a_CFLAGS+=\
@F_OMIT_FRAME_POINTER@ @CFLAGS_CONSTTIME@
noinst_LIBRARIES+=src/lib/libcurve25519_donna.a
LIBDONNA=src/lib/libcurve25519_donna.a
else
if BUILD_CURVE25519_DONNA_C64
src_lib_libcurve25519_donna_a_CFLAGS+=@CFLAGS_CONSTTIME@
src_lib_libcurve25519_donna_a_SOURCES=\
src/ext/curve25519_donna/curve25519-donna-c64.c
noinst_LIBRARIES+=src/lib/libcurve25519_donna.a
LIBDONNA=src/lib/libcurve25519_donna.a
else
LIBDONNA=
endif
endif
LIBDONNA += $(LIBED25519_REF10)
LIBDONNA += $(LIBED25519_DONNA)