-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 ad918baef5b4551bda35cf99e97e553a9aef7698..6c1d8d7859c2f8f1d52c67e3bf9d8e781c94ff1d 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,7 +1,9 @@
-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
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 dist_pkgcfg_DATA = \
@@ -14,7 +16,7 @@ if MINGW
 noinst_LTLIBRARIES = \
   libgnunetutilwin.la
 libgnunetutilwin_la_SOURCES = \
-  win.cc \
+  win.c \
   winproc.c
 libgnunetutilwin_la_LDFLAGS = \
   -no-undefined -Wl,--export-all-symbols 
@@ -22,6 +24,7 @@ libgnunetutilwin_la_LIBADD = \
   -lshell32 -liconv -lstdc++ \
   -lcomdlg32 -lgdi32 -liphlpapi
 WINLIB = libgnunetutilwin.la
+W32CAT = w32cat
 endif
 
 if !MINGW
@@ -33,8 +36,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+w32cat_SOURCES = w32cat.c
+
 noinst_PROGRAMS = \
  gnunet-config-diff \
+ $(W32CAT) \
  test_common_logging_dummy
 
 
@@ -67,21 +73,22 @@ libgnunetutil_la_SOURCES = \
   container_heap.c \
   container_meta_data.c \
   container_multihashmap.c \
+  container_multihashmap32.c \
   container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
+  crypto_ecc.c \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
-  crypto_ksk.c \
   crypto_random.c \
-  crypto_rsa.c \
   disk.c \
   disk.h \
   getopt.c \
   getopt_helpers.c \
   helper.c \
   load.c \
+  mq.c \
   network.c \
   os_installation.c \
   os_network.c \
@@ -89,7 +96,6 @@ libgnunetutil_la_SOURCES = \
   peer.c \
   plugin.c \
   program.c \
-  pseudonym.c \
   resolver_api.c resolver.h \
   scheduler.c \
   server.c \
@@ -102,22 +108,30 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
-
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
-  -lltdl -lz -lunistring $(XLIB) 
+  $(LTLIBINTL) \
+  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 7:0:0
+  -version-info 11:0:2
+
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
+
 
+libexec_PROGRAMS = \
+ gnunet-service-resolver 
 
 bin_PROGRAMS = \
- gnunet-service-resolver \
  gnunet-resolver \
- gnunet-rsa
+ gnunet-config \
+ $(GNUNET_ECC) \
+ gnunet-uri 
 
 
 gnunet_service_resolver_SOURCES = \
@@ -138,12 +152,30 @@ gnunet_resolver_DEPENDENCIES = \
   libgnunetutil.la
 
 
-gnunet_rsa_SOURCES = \
- gnunet-rsa.c         
-gnunet_rsa_LDADD = \
+gnunet_ecc_SOURCES = \
+ gnunet-ecc.c         
+gnunet_ecc_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) -lgcrypt
+gnunet_ecc_DEPENDENCIES = \
+  libgnunetutil.la
+
+
+gnunet_config_SOURCES = \
+ gnunet-config.c         
+gnunet_config_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_config_DEPENDENCIES = \
+  libgnunetutil.la
+
+
+gnunet_uri_SOURCES = \
+ gnunet-uri.c         
+gnunet_uri_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_rsa_DEPENDENCIES = \
+gnunet_uri_DEPENDENCIES = \
   libgnunetutil.la
 
 plugin_LTLIBRARIES = \
@@ -156,7 +188,9 @@ libgnunet_plugin_test_la_LDFLAGS = \
 
 if HAVE_BENCHMARKS
  BENCHMARKS = \
-  perf_crypto_hash 
+  perf_crypto_hash \
+  perf_crypto_aes \
+  perf_malloc
 endif
 
 check_PROGRAMS = \
@@ -169,16 +203,15 @@ check_PROGRAMS = \
  test_container_bloomfilter \
  test_container_meta_data \
  test_container_multihashmap \
+ test_container_multihashmap32 \
  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 \
@@ -187,12 +220,12 @@ check_PROGRAMS = \
  test_connection_timeout \
  test_connection_timeout_no_connect \
  test_connection_transmit_cancel \
+ test_mq \
+ test_mq_client \
  test_os_network \
- test_os_priority \
  test_peer \
  test_plugin \
  test_program \
- test_pseudonym \
  test_resolver_api \
  test_scheduler \
  test_scheduler_delay \
@@ -203,6 +236,7 @@ check_PROGRAMS = \
  $(SERVER_CLIENT_UNIX) \
  test_service \
  test_strings \
+ test_strings_to_data \
  test_time \
  test_speedup \
  $(BENCHMARKS) \
@@ -223,6 +257,8 @@ test_os_start_process_SOURCES = \
  test_os_start_process.c
 test_os_start_process_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
+test_os_start_process_DEPENDENCIES = \
+ $(WINCAT)
 
 test_client_SOURCES = \
  test_client.c
@@ -267,7 +303,12 @@ test_container_meta_data_LDADD = \
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
 test_container_multihashmap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_container_multihashmap32_SOURCES = \
+ test_container_multihashmap32.c
+test_container_multihashmap32_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 test_container_heap_SOURCES = \
  test_container_heap.c
@@ -284,17 +325,17 @@ 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 = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_crypto_ecc_SOURCES = \
+ test_crypto_ecc.c
+test_crypto_ecc_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
 test_crypto_hash_SOURCES = \
  test_crypto_hash.c
 test_crypto_hash_LDADD = \
@@ -305,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 = \
@@ -360,16 +391,21 @@ test_connection_transmit_cancel_SOURCES = \
 test_connection_transmit_cancel_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_mq_SOURCES = \
+ test_mq.c
+test_mq_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_mq_client_SOURCES = \
+ test_mq_client.c
+test_mq_client_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_os_network_SOURCES = \
  test_os_network.c
 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 = \
@@ -385,11 +421,6 @@ test_program_SOURCES = \
 test_program_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_pseudonym_SOURCES = \
- test_pseudonym.c
-test_pseudonym_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_resolver_api_SOURCES = \
  test_resolver_api.c
 test_resolver_api_LDADD = \
@@ -441,6 +472,13 @@ test_strings_SOURCES = \
 test_strings_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+
+test_strings_to_data_SOURCES = \
+ test_strings_to_data.c
+test_strings_to_data_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
 test_time_SOURCES = \
  test_time.c
 test_time_LDADD = \
@@ -456,11 +494,20 @@ 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 = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 
 EXTRA_DIST = \
   test_configuration_data.conf \
   test_program_data.conf \
-  test_pseudonym_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
   test_speedup_data.conf