diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 11:53:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-05 11:53:53 +0100 |
| commit | a226f7653620f8c5b570ca63c26df98bdc1d84c4 (patch) | |
| tree | a3fc9adc2df6d31f39a5ebeec2a29375ce197be0 /tests | |
| parent | cc621a9838cb045a370717a764907a6d6c47fa76 (diff) | |
| parent | c44e92a4151248f80a31c8aa7343e399e508fa95 (diff) | |
| download | qemu-a226f7653620f8c5b570ca63c26df98bdc1d84c4.tar.gz qemu-a226f7653620f8c5b570ca63c26df98bdc1d84c4.tar.bz2 qemu-a226f7653620f8c5b570ca63c26df98bdc1d84c4.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-04-05-1' into staging
Merge QCrypto fixes 2016/04/05 v1
# gpg: Signature made Tue 05 Apr 2016 10:53:59 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-qcrypto-2016-04-05-1:
crypto: fix nettle config check for running pbkdf test
crypto: fix typo in docs for secret object type
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 45b9048754..651d8b2dac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,7 +92,7 @@ check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) check-unit-y += tests/test-io-channel-command$(EXESUF) check-unit-y += tests/test-io-channel-buffer$(EXESUF) check-unit-y += tests/test-base64$(EXESUF) -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) +check-unit-$(if $(CONFIG_NETTLE_KDF),y,$(CONFIG_GCRYPT_KDF)) += tests/test-crypto-pbkdf$(EXESUF) check-unit-y += tests/test-crypto-ivgen$(EXESUF) check-unit-y += tests/test-crypto-afsplit$(EXESUF) check-unit-y += tests/test-crypto-xts$(EXESUF) |