diff options
| author | Peter Maydell | 2017-11-10 17:01:35 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-10 17:01:35 +0100 |
| commit | 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8 (patch) | |
| tree | 7d34e7b7046f135f433cd4a95b13c9c770e5f50e /tests | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171108' int... (diff) | |
| parent | crypto: afalg: fix a NULL pointer dereference (diff) | |
| download | qemu-4ffa88c99c54d2a30f79e3dbecec50b023eff1c8.tar.gz qemu-4ffa88c99c54d2a30f79e3dbecec50b023eff1c8.tar.xz qemu-4ffa88c99c54d2a30f79e3dbecec50b023eff1c8.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging
Merge qcrypto 2017/11/08 v1
# gpg: Signature made Wed 08 Nov 2017 11:06:38 GMT
# gpg: using RSA key 0xBE86EBB415104FDF
# 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/pull-qcrypto-2017-11-08-1:
crypto: afalg: fix a NULL pointer dereference
tests: Run the luks tests in test-crypto-block only if encryption is available
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-crypto-block.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c index bd7fe593e3..fd29a045d2 100644 --- a/tests/test-crypto-block.c +++ b/tests/test-crypto-block.c @@ -28,7 +28,8 @@ #include <sys/resource.h> #endif -#if (defined(_WIN32) || defined RUSAGE_THREAD) +#if (defined(_WIN32) || defined RUSAGE_THREAD) && \ + (defined(CONFIG_NETTLE_KDF) || defined(CONFIG_GCRYPT_KDF)) #define TEST_LUKS #else #undef TEST_LUKS |