-encrypt using both AES and TWOFISH, with independent symmetric keys

[oweals/gnunet.git] / src / util / Makefile.am

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index cb058e40d6533e5acb8de1c399466cd0747d70eb..6c1d8d7859c2f8f1d52c67e3bf9d8e781c94ff1d 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -189,6 +189,7 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
+  perf_crypto_aes \
   perf_malloc
 endif
 
@@ -206,7 +207,6 @@ check_PROGRAMS = \
  test_container_heap \
  test_container_slist \
  test_crypto_aes \
- test_crypto_aes_weak \
  test_crypto_crc \
  test_crypto_ecc \
  test_crypto_hash \
@@ -325,12 +325,6 @@ test_crypto_aes_SOURCES = \
 test_crypto_aes_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_aes_weak_SOURCES = \
- test_crypto_aes_weak.c
-test_crypto_aes_weak_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  \
- $(LIBGCRYPT_LIBS)
-
 test_crypto_crc_SOURCES = \
  test_crypto_crc.c
 test_crypto_crc_LDADD = \
@@ -500,6 +494,11 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+perf_crypto_aes_SOURCES = \
+ perf_crypto_aes.c
+perf_crypto_aes_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 perf_malloc_SOURCES = \
  perf_malloc.c
 perf_malloc_LDADD = \