diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-12 13:00:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-12 13:00:45 -0400 |
| commit | 607a9056d4d91762db0d5fc13250c6ed272f0e1b (patch) | |
| tree | 990ae93163ea5feb28871214f1979475e0f10a46 /src/ext/include.am | |
| parent | 58e0e587a6e0ddb04a8fa6a58852d843b1c21a2c (diff) | |
| parent | fb999abea6edc99f151f546a7a4a60cf5b5f221b (diff) | |
| download | tor-607a9056d4d91762db0d5fc13250c6ed272f0e1b.tar.gz tor-607a9056d4d91762db0d5fc13250c6ed272f0e1b.zip | |
Merge branch 'ftrapv_v3'
There were some conflicts here, and some breakage to fix concerning
library link order in newer targets.
Diffstat (limited to 'src/ext/include.am')
| -rw-r--r-- | src/ext/include.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ext/include.am b/src/ext/include.am index 708f550ba0..6cfdbcc447 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -20,7 +20,8 @@ EXTHEADERS = \ noinst_HEADERS+= $(EXTHEADERS) -src_ext_ed25519_ref10_libed25519_ref10_a_CFLAGS= +src_ext_ed25519_ref10_libed25519_ref10_a_CFLAGS=\ + @CFLAGS_CONSTTIME@ src_ext_ed25519_ref10_libed25519_ref10_a_SOURCES= \ src/ext/ed25519/ref10/fe_0.c \ @@ -97,7 +98,8 @@ noinst_HEADERS += $(ED25519_REF10_HDRS) LIBED25519_REF10=src/ext/ed25519/ref10/libed25519_ref10.a noinst_LIBRARIES += $(LIBED25519_REF10) -src_ext_ed25519_donna_libed25519_donna_a_CFLAGS= \ +src_ext_ed25519_donna_libed25519_donna_a_CFLAGS=\ + @CFLAGS_CONSTTIME@ \ -DED25519_CUSTOMRANDOM \ -DED25519_SUFFIX=_donna @@ -139,7 +141,8 @@ noinst_HEADERS += $(ED25519_DONNA_HDRS) LIBED25519_DONNA=src/ext/ed25519/donna/libed25519_donna.a noinst_LIBRARIES += $(LIBED25519_DONNA) -src_ext_keccak_tiny_libkeccak_tiny_a_CFLAGS= +src_ext_keccak_tiny_libkeccak_tiny_a_CFLAGS=\ + @CFLAGS_CONSTTIME@ src_ext_keccak_tiny_libkeccak_tiny_a_SOURCES= \ src/ext/keccak-tiny/keccak-tiny-unrolled.c |