-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 275c988471fbd23d85bc2dec1d97357b9844ece0..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
 
@@ -81,9 +81,7 @@ libgnunetutil_la_SOURCES = \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
-  crypto_ksk.c \
   crypto_random.c \
-  crypto_rsa.c \
   disk.c \
   disk.h \
   getopt.c \
@@ -110,20 +108,21 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
-libgnunetutil_la_CPPFLAGS = \
-  $(LTDLINCL)
-
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
+  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 11:0:2
 
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
+
 
 libexec_PROGRAMS = \
  gnunet-service-resolver 
@@ -131,8 +130,7 @@ libexec_PROGRAMS = \
 bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
- gnunet-ecc \
- gnunet-rsa \
+ $(GNUNET_ECC) \
  gnunet-uri 
 
 
@@ -154,15 +152,6 @@ gnunet_resolver_DEPENDENCIES = \
   libgnunetutil.la
 
 
-gnunet_rsa_SOURCES = \
- gnunet-rsa.c         
-gnunet_rsa_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) -lgcrypt
-gnunet_rsa_DEPENDENCIES = \
-  libgnunetutil.la
-
-
 gnunet_ecc_SOURCES = \
  gnunet-ecc.c         
 gnunet_ecc_LDADD = \
@@ -200,6 +189,7 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
+  perf_crypto_aes \
   perf_malloc
 endif
 
@@ -217,14 +207,11 @@ check_PROGRAMS = \
  test_container_heap \
  test_container_slist \
  test_crypto_aes \
- test_crypto_aes_weak \
  test_crypto_crc \
  test_crypto_ecc \
  test_crypto_hash \
  test_crypto_hkdf \
- test_crypto_ksk \
  test_crypto_random \
- test_crypto_rsa \
  test_disk \
  test_getopt \
  test_connection \
@@ -236,7 +223,6 @@ check_PROGRAMS = \
  test_mq \
  test_mq_client \
  test_os_network \
- test_os_priority \
  test_peer \
  test_plugin \
  test_program \
@@ -339,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 = \
@@ -366,21 +346,11 @@ test_crypto_hkdf_SOURCES = \
 test_crypto_hkdf_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_ksk_SOURCES = \
- test_crypto_ksk.c
-test_crypto_ksk_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_crypto_random_SOURCES = \
  test_crypto_random.c
 test_crypto_random_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_rsa_SOURCES = \
- test_crypto_rsa.c
-test_crypto_rsa_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_disk_SOURCES = \
  test_disk.c
 test_disk_LDADD = \
@@ -436,11 +406,6 @@ test_os_network_SOURCES = \
 test_os_network_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_os_priority_SOURCES = \
- test_os_priority.c
-test_os_priority_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_peer_SOURCES = \
  test_peer.c
 test_peer_LDADD = \
@@ -529,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 = \