Fix perf_crypto_rsa.c after various changes

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 916a588fa54aba2a8503dd1eb1ce14a319742a52..fe8ab01ead4fa848aea34ba63aa5c976d067896c 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -76,6 +76,7 @@ libgnunetutil_la_SOURCES = \
   crypto_symmetric.c \
   crypto_crc.c \
   crypto_ecc.c \
+  crypto_ecc_dlog.c \
   crypto_ecc_setup.c \
   crypto_hash.c \
   crypto_hash_file.c \
@@ -86,7 +87,6 @@ libgnunetutil_la_SOURCES = \
   crypto_random.c \
   crypto_rsa.c \
   disk.c \
-  disk_iterator.c \
   disk.h \
   getopt.c \
   getopt_helpers.c \
@@ -110,6 +110,7 @@ libgnunetutil_la_SOURCES = \
   signal.c \
   strings.c \
   time.c \
+  socks.c \
   speedup.c speedup.h
 
 libgnunetutil_la_LIBADD = \
@@ -246,15 +247,22 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
+  perf_crypto_ecc_dlog \
+  perf_crypto_rsa \
   perf_crypto_paillier \
   perf_crypto_symmetric \
   perf_crypto_asymmetric \
   perf_malloc
 endif
 
+if HAVE_SSH_KEY
+ SSH_USING_TESTS = test_socks.nc
+endif
+
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
+ $(SSH_USING_TESTS) \
  test_common_allocation \
  test_common_endian \
  test_common_logging \
@@ -271,9 +279,11 @@ check_PROGRAMS = \
  test_crypto_eddsa \
  test_crypto_ecdhe \
  test_crypto_ecdh_eddsa \
+ test_crypto_ecc_dlog \
  test_crypto_hash \
  test_crypto_hash_context \
  test_crypto_hkdf \
+ test_crypto_kdf \
  test_crypto_paillier \
  test_crypto_random \
  test_crypto_rsa \
@@ -344,6 +354,11 @@ test_client_nc_SOURCES = \
 test_client_nc_LDADD = \
  libgnunetutil.la
 
+test_socks_nc_SOURCES = \
+ test_socks.c
+test_socks_nc_LDADD = \
+ libgnunetutil.la
+
 test_common_allocation_SOURCES = \
  test_common_allocation.c
 test_common_allocation_LDADD = \
@@ -421,6 +436,12 @@ test_crypto_eddsa_LDADD = \
  libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
+test_crypto_ecc_dlog_SOURCES = \
+ test_crypto_ecc_dlog.c
+test_crypto_ecc_dlog_LDADD = \
+ libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
 test_crypto_ecdhe_SOURCES = \
  test_crypto_ecdhe.c
 test_crypto_ecdhe_LDADD = \
@@ -448,6 +469,11 @@ test_crypto_hkdf_SOURCES = \
 test_crypto_hkdf_LDADD = \
  libgnunetutil.la
 
+test_crypto_kdf_SOURCES = \
+ test_crypto_kdf.c
+test_crypto_kdf_LDADD = \
+ libgnunetutil.la -lgcrypt
+
 test_crypto_paillier_SOURCES = \
  test_crypto_paillier.c
 test_crypto_paillier_LDADD = \
@@ -462,7 +488,7 @@ test_crypto_random_LDADD = \
 test_crypto_rsa_SOURCES = \
  test_crypto_rsa.c
 test_crypto_rsa_LDADD = \
- libgnunetutil.la
+ libgnunetutil.la -lgcrypt
 
 test_disk_SOURCES = \
  test_disk.c
@@ -607,6 +633,17 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_LDADD = \
  libgnunetutil.la
 
+perf_crypto_ecc_dlog_SOURCES = \
+ perf_crypto_ecc_dlog.c
+perf_crypto_ecc_dlog_LDADD = \
+ libgnunetutil.la \
+ -lgcrypt
+
+perf_crypto_rsa_SOURCES = \
+ perf_crypto_rsa.c
+perf_crypto_rsa_LDADD = \
+ libgnunetutil.la
+
 perf_crypto_symmetric_SOURCES = \
  perf_crypto_symmetric.c
 perf_crypto_symmetric_LDADD = \