diff options
| author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-03-30 19:26:40 +0200 |
|---|---|---|
| committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-03-30 19:26:40 +0200 |
| commit | ca4c9eae269c34765df26699fe756860c7827693 (patch) | |
| tree | 3e3a70fc3294bc6b62b4f9d099d5cbcabf25c3ee /src/util/Makefile.am | |
| parent | d8b32bc60d26a8a30b71530af0bd3e9e037e073b (diff) | |
UTIL/SCALARPRODUCT: Do not build ECC dlog or scalarproduct with incompatible libgcrypt versions (>=1.9.0)
Diffstat (limited to 'src/util/Makefile.am')
| -rw-r--r-- | src/util/Makefile.am | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 6b9e083a7..e2614e5e3 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -25,6 +25,11 @@ if ENABLE_BENCHMARK PTHREAD = -lpthread endif +if HAVE_NOLIBGCRYPT19 + DLOG = crypto_ecc_dlog.c + DLOG_TEST = test_crypto_ecc_dlog +endif + gnunet_config_diff_SOURCES = \ gnunet-config-diff.c gnunet_config_diff_LDADD = \ @@ -58,7 +63,7 @@ libgnunetutil_la_SOURCES = \ crypto_symmetric.c \ crypto_crc.c \ crypto_ecc.c \ - crypto_ecc_dlog.c \ + $(DLOG) \ crypto_ecc_setup.c \ crypto_hash.c \ crypto_hash_file.c \ @@ -248,7 +253,6 @@ 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 \ @@ -256,6 +260,10 @@ if HAVE_BENCHMARKS perf_malloc \ perf_mq \ perf_scheduler + +if HAVE_NOLIBGCRYPT19 + BENCHMARKS += perf_crypto_ecc_dlog +endif endif if HAVE_SSH_KEY @@ -287,7 +295,7 @@ check_PROGRAMS = \ test_crypto_ecdhe \ test_crypto_ecdh_eddsa \ test_crypto_ecdh_ecdsa \ - test_crypto_ecc_dlog \ + $(DLOG_TEST) \ test_crypto_hash \ test_crypto_hash_context \ test_crypto_hkdf \ @@ -448,11 +456,13 @@ test_crypto_eddsa_LDADD = \ libgnunetutil.la \ $(LIBGCRYPT_LIBS) +if HAVE_NOLIBGCRYPT19 test_crypto_ecc_dlog_SOURCES = \ test_crypto_ecc_dlog.c test_crypto_ecc_dlog_LDADD = \ libgnunetutil.la \ $(LIBGCRYPT_LIBS) +endif test_crypto_ecdhe_SOURCES = \ test_crypto_ecdhe.c @@ -595,11 +605,13 @@ perf_crypto_hash_SOURCES = \ perf_crypto_hash_LDADD = \ libgnunetutil.la +if HAVE_NOLIBGCRYPT19 perf_crypto_ecc_dlog_SOURCES = \ perf_crypto_ecc_dlog.c perf_crypto_ecc_dlog_LDADD = \ libgnunetutil.la \ -lgcrypt +endif perf_crypto_rsa_SOURCES = \ perf_crypto_rsa.c |