Imported Upstream version 0.9.5aupstream

82 files changed, 8470 insertions, 4169 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 8414ef2..425cc8c 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -2,6 +2,8 @@ INCLUDES = -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
 
 
@@ -70,6 +76,7 @@ libgnunetutil_la_SOURCES = \
   container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
+  crypto_ecc.c \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
@@ -107,17 +114,23 @@ libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
+  $(LTLIBINTL) \
   -lltdl -lz -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 8:0:0
+  -version-info 11:0:2
+
 
+libexec_PROGRAMS = \
+ gnunet-service-resolver 
 
 bin_PROGRAMS = \
- gnunet-service-resolver \
  gnunet-resolver \
- gnunet-rsa
+ gnunet-config \
+ gnunet-ecc \
+ gnunet-rsa \
+ gnunet-uri 
 
 
 gnunet_service_resolver_SOURCES = \
@@ -142,10 +155,37 @@ gnunet_rsa_SOURCES = \
  gnunet-rsa.c         
 gnunet_rsa_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
+  $(GN_LIBINTL) -lgcrypt
 gnunet_rsa_DEPENDENCIES = \
   libgnunetutil.la
 
+
+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_uri_DEPENDENCIES = \
+  libgnunetutil.la
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -156,7 +196,8 @@ libgnunet_plugin_test_la_LDFLAGS = \
 
 if HAVE_BENCHMARKS
  BENCHMARKS = \
-  perf_crypto_hash 
+  perf_crypto_hash \
+  perf_malloc
 endif
 
 check_PROGRAMS = \
@@ -174,6 +215,7 @@ check_PROGRAMS = \
  test_crypto_aes \
  test_crypto_aes_weak \
  test_crypto_crc \
+ test_crypto_ecc \
  test_crypto_hash \
  test_crypto_hkdf \
  test_crypto_ksk \
@@ -223,6 +265,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
@@ -295,6 +339,11 @@ test_crypto_crc_SOURCES = \
 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  
+
 test_crypto_hash_SOURCES = \
  test_crypto_hash.c
 test_crypto_hash_LDADD = \
@@ -456,6 +505,11 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_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 \
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 5ea0157..9406228 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,10 +54,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-noinst_PROGRAMS = gnunet-config-diff$(EXEEXT) \
+noinst_PROGRAMS = gnunet-config-diff$(EXEEXT) $(am__EXEEXT_3) \
 	test_common_logging_dummy$(EXEEXT)
-bin_PROGRAMS = gnunet-service-resolver$(EXEEXT) \
-	gnunet-resolver$(EXEEXT) gnunet-rsa$(EXEEXT)
+libexec_PROGRAMS = gnunet-service-resolver$(EXEEXT)
+bin_PROGRAMS = gnunet-resolver$(EXEEXT) gnunet-config$(EXEEXT) \
+	gnunet-ecc$(EXEEXT) gnunet-rsa$(EXEEXT) gnunet-uri$(EXEEXT)
 check_PROGRAMS = test_bio$(EXEEXT) test_client$(EXEEXT) \
 	test_common_allocation$(EXEEXT) test_common_endian$(EXEEXT) \
 	test_common_logging$(EXEEXT) test_configuration$(EXEEXT) \
@@ -49,11 +67,12 @@ check_PROGRAMS = test_bio$(EXEEXT) test_client$(EXEEXT) \
 	test_container_multihashmap$(EXEEXT) \
 	test_container_heap$(EXEEXT) test_container_slist$(EXEEXT) \
 	test_crypto_aes$(EXEEXT) test_crypto_aes_weak$(EXEEXT) \
-	test_crypto_crc$(EXEEXT) test_crypto_hash$(EXEEXT) \
-	test_crypto_hkdf$(EXEEXT) test_crypto_ksk$(EXEEXT) \
-	test_crypto_random$(EXEEXT) test_crypto_rsa$(EXEEXT) \
-	test_disk$(EXEEXT) test_getopt$(EXEEXT) \
-	test_connection$(EXEEXT) test_connection_addressing$(EXEEXT) \
+	test_crypto_crc$(EXEEXT) test_crypto_ecc$(EXEEXT) \
+	test_crypto_hash$(EXEEXT) test_crypto_hkdf$(EXEEXT) \
+	test_crypto_ksk$(EXEEXT) test_crypto_random$(EXEEXT) \
+	test_crypto_rsa$(EXEEXT) test_disk$(EXEEXT) \
+	test_getopt$(EXEEXT) test_connection$(EXEEXT) \
+	test_connection_addressing$(EXEEXT) \
 	test_connection_receive_cancel$(EXEEXT) \
 	test_connection_timeout$(EXEEXT) \
 	test_connection_timeout_no_connect$(EXEEXT) \
@@ -75,14 +94,15 @@ DIST_COMMON = $(dist_pkgcfg_DATA) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
 	$(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -112,17 +132,23 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
-	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgcfgdir)" \
-	"$(DESTDIR)$(pkgcfgdir)"
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
+	"$(DESTDIR)$(pkgcfgdir)" "$(DESTDIR)$(pkgcfgdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
 	$(plugin_LTLIBRARIES)
 libgnunet_plugin_test_la_LIBADD =
 am_libgnunet_plugin_test_la_OBJECTS = test_plugin_plug.lo
 libgnunet_plugin_test_la_OBJECTS =  \
 	$(am_libgnunet_plugin_test_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libgnunet_plugin_test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -130,38 +156,45 @@ libgnunet_plugin_test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libgnunetutil_la_DEPENDENCIES = $(WINLIB) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libgnunetutil_la_OBJECTS = bandwidth.lo bio.lo client.lo \
 	common_allocation.lo common_endian.lo common_logging.lo \
 	configuration.lo connection.lo container_bloomfilter.lo \
 	container_heap.lo container_meta_data.lo \
 	container_multihashmap.lo container_slist.lo crypto_aes.lo \
-	crypto_crc.lo crypto_hash.lo crypto_hkdf.lo crypto_kdf.lo \
-	crypto_ksk.lo crypto_random.lo crypto_rsa.lo disk.lo getopt.lo \
-	getopt_helpers.lo helper.lo load.lo network.lo \
-	os_installation.lo os_network.lo os_priority.lo peer.lo \
-	plugin.lo program.lo pseudonym.lo resolver_api.lo scheduler.lo \
-	server.lo server_mst.lo server_nc.lo server_tc.lo service.lo \
-	signal.lo strings.lo time.lo speedup.lo
+	crypto_crc.lo crypto_ecc.lo crypto_hash.lo crypto_hkdf.lo \
+	crypto_kdf.lo crypto_ksk.lo crypto_random.lo crypto_rsa.lo \
+	disk.lo getopt.lo getopt_helpers.lo helper.lo load.lo \
+	network.lo os_installation.lo os_network.lo os_priority.lo \
+	peer.lo plugin.lo program.lo pseudonym.lo resolver_api.lo \
+	scheduler.lo server.lo server_mst.lo server_nc.lo server_tc.lo \
+	service.lo signal.lo strings.lo time.lo speedup.lo
 libgnunetutil_la_OBJECTS = $(am_libgnunetutil_la_OBJECTS)
 libgnunetutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libgnunetutil_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
 libgnunetutilwin_la_DEPENDENCIES =
-am__libgnunetutilwin_la_SOURCES_DIST = win.cc winproc.c
+am__libgnunetutilwin_la_SOURCES_DIST = win.c winproc.c
 @MINGW_TRUE@am_libgnunetutilwin_la_OBJECTS = win.lo winproc.lo
 libgnunetutilwin_la_OBJECTS = $(am_libgnunetutilwin_la_OBJECTS)
-libgnunetutilwin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(libgnunetutilwin_la_LDFLAGS) \
+libgnunetutilwin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libgnunetutilwin_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @MINGW_TRUE@am_libgnunetutilwin_la_rpath =
 @MINGW_FALSE@am__EXEEXT_1 = test_server_with_client_unix$(EXEEXT)
-@HAVE_BENCHMARKS_TRUE@am__EXEEXT_2 = perf_crypto_hash$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+@HAVE_BENCHMARKS_TRUE@am__EXEEXT_2 = perf_crypto_hash$(EXEEXT) \
+@HAVE_BENCHMARKS_TRUE@	perf_malloc$(EXEEXT)
+@MINGW_TRUE@am__EXEEXT_3 = w32cat$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+am_gnunet_config_OBJECTS = gnunet-config.$(OBJEXT)
+gnunet_config_OBJECTS = $(am_gnunet_config_OBJECTS)
 am_gnunet_config_diff_OBJECTS = gnunet-config-diff.$(OBJEXT)
 gnunet_config_diff_OBJECTS = $(am_gnunet_config_diff_OBJECTS)
+am_gnunet_ecc_OBJECTS = gnunet-ecc.$(OBJEXT)
+gnunet_ecc_OBJECTS = $(am_gnunet_ecc_OBJECTS)
 am_gnunet_resolver_OBJECTS = gnunet-resolver.$(OBJEXT)
 gnunet_resolver_OBJECTS = $(am_gnunet_resolver_OBJECTS)
 am_gnunet_rsa_OBJECTS = gnunet-rsa.$(OBJEXT)
@@ -170,10 +203,15 @@ am_gnunet_service_resolver_OBJECTS =  \
 	gnunet-service-resolver.$(OBJEXT)
 gnunet_service_resolver_OBJECTS =  \
 	$(am_gnunet_service_resolver_OBJECTS)
+am_gnunet_uri_OBJECTS = gnunet-uri.$(OBJEXT)
+gnunet_uri_OBJECTS = $(am_gnunet_uri_OBJECTS)
 am_perf_crypto_hash_OBJECTS = perf_crypto_hash.$(OBJEXT)
 perf_crypto_hash_OBJECTS = $(am_perf_crypto_hash_OBJECTS)
 perf_crypto_hash_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la
+am_perf_malloc_OBJECTS = perf_malloc.$(OBJEXT)
+perf_malloc_OBJECTS = $(am_perf_malloc_OBJECTS)
+perf_malloc_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
 am_test_bio_OBJECTS = test_bio.$(OBJEXT)
 test_bio_OBJECTS = $(am_test_bio_OBJECTS)
 test_bio_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
@@ -279,6 +317,10 @@ am_test_crypto_crc_OBJECTS = test_crypto_crc.$(OBJEXT)
 test_crypto_crc_OBJECTS = $(am_test_crypto_crc_OBJECTS)
 test_crypto_crc_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la
+am_test_crypto_ecc_OBJECTS = test_crypto_ecc.$(OBJEXT)
+test_crypto_ecc_OBJECTS = $(am_test_crypto_ecc_OBJECTS)
+test_crypto_ecc_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la
 am_test_crypto_hash_OBJECTS = test_crypto_hash.$(OBJEXT)
 test_crypto_hash_OBJECTS = $(am_test_crypto_hash_OBJECTS)
 test_crypto_hash_DEPENDENCIES =  \
@@ -315,8 +357,6 @@ test_os_priority_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_test_os_start_process_OBJECTS = test_os_start_process.$(OBJEXT)
 test_os_start_process_OBJECTS = $(am_test_os_start_process_OBJECTS)
-test_os_start_process_DEPENDENCIES =  \
-	$(top_builddir)/src/util/libgnunetutil.la
 am_test_peer_OBJECTS = test_peer.$(OBJEXT)
 test_peer_OBJECTS = $(am_test_peer_OBJECTS)
 test_peer_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
@@ -379,6 +419,9 @@ test_strings_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
 am_test_time_OBJECTS = test_time.$(OBJEXT)
 test_time_OBJECTS = $(am_test_time_OBJECTS)
 test_time_DEPENDENCIES = $(top_builddir)/src/util/libgnunetutil.la
+am_w32cat_OBJECTS = w32cat.$(OBJEXT)
+w32cat_OBJECTS = $(am_w32cat_OBJECTS)
+w32cat_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -389,43 +432,29 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(libgnunetutil_la_SOURCES) $(libgnunetutilwin_la_SOURCES) \
-	$(gnunet_config_diff_SOURCES) $(gnunet_resolver_SOURCES) \
+	$(gnunet_config_SOURCES) $(gnunet_config_diff_SOURCES) \
+	$(gnunet_ecc_SOURCES) $(gnunet_resolver_SOURCES) \
 	$(gnunet_rsa_SOURCES) $(gnunet_service_resolver_SOURCES) \
-	$(perf_crypto_hash_SOURCES) $(test_bio_SOURCES) \
+	$(gnunet_uri_SOURCES) $(perf_crypto_hash_SOURCES) \
+	$(perf_malloc_SOURCES) $(test_bio_SOURCES) \
 	$(test_client_SOURCES) $(test_common_allocation_SOURCES) \
 	$(test_common_endian_SOURCES) $(test_common_logging_SOURCES) \
 	$(test_common_logging_dummy_SOURCES) \
@@ -442,27 +471,29 @@ SOURCES = $(libgnunet_plugin_test_la_SOURCES) \
 	$(test_container_multihashmap_SOURCES) \
 	$(test_container_slist_SOURCES) $(test_crypto_aes_SOURCES) \
 	$(test_crypto_aes_weak_SOURCES) $(test_crypto_crc_SOURCES) \
-	$(test_crypto_hash_SOURCES) $(test_crypto_hkdf_SOURCES) \
-	$(test_crypto_ksk_SOURCES) $(test_crypto_random_SOURCES) \
-	$(test_crypto_rsa_SOURCES) $(test_disk_SOURCES) \
-	$(test_getopt_SOURCES) $(test_os_network_SOURCES) \