summary refs log tree commit diff stats
path: root/tests/test-crypto-block.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-10-23 12:19:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-10-23 12:19:44 +0100
commit7acd80e82d9332dfdaedc60c91eb3ec5195738bb (patch)
treeeee59246bc7e3f899ed7daa830b46dc9dfa77d01 /tests/test-crypto-block.c
parent3ebee3b191e755d3f7311a6a62eea5c9628b221b (diff)
parent64dd2f3b5b090c21c3e82142de3fe7b4793ce6c8 (diff)
downloadfocaccia-qemu-7acd80e82d9332dfdaedc60c91eb3ec5195738bb.tar.gz
focaccia-qemu-7acd80e82d9332dfdaedc60c91eb3ec5195738bb.zip
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Update min required crypto library versions

The min required versions for crypto libraries are now

 - gnutls >= 3.1.18
 - nettle >= 2.7.1
 - gcrypt >= 1.5.0

# gpg: Signature made Fri 19 Oct 2018 14:42:35 BST
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/qcrypto-next-pull-request:
  crypto: require nettle >= 2.7.1 for building QEMU
  crypto: require libgcrypt >= 1.5.0 for building QEMU
  crypto: require gnutls >= 3.1.18 for building QEMU

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-crypto-block.c')
-rw-r--r--tests/test-crypto-block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
index fd29a045d2..fae4ffc453 100644
--- a/tests/test-crypto-block.c
+++ b/tests/test-crypto-block.c
@@ -29,7 +29,7 @@
 #endif
 
 #if (defined(_WIN32) || defined RUSAGE_THREAD) && \
-    (defined(CONFIG_NETTLE_KDF) || defined(CONFIG_GCRYPT_KDF))
+    (defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT))
 #define TEST_LUKS
 #else
 #undef TEST_LUKS