diff options
| author | Daniel P. Berrange | 2016-03-29 16:47:51 +0200 |
|---|---|---|
| committer | Daniel P. Berrange | 2016-03-30 15:55:11 +0200 |
| commit | fff2f982ab6ac0dd2b641d30303f72270a019f28 (patch) | |
| tree | 8a56cfdf4397cb393683e27201bbe23fb84848b8 /crypto | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| download | qemu-fff2f982ab6ac0dd2b641d30303f72270a019f28.tar.gz qemu-fff2f982ab6ac0dd2b641d30303f72270a019f28.tar.xz qemu-fff2f982ab6ac0dd2b641d30303f72270a019f28.zip | |
crypto: do an explicit check for nettle pbkdf functions
Support for the PBKDF functions in nettle was not introduced
until version 2.6. Some distros QEMU targets have older
versions and thus lack PBKDF support. Address this by doing
a check in configure for the desired function and then skipping
compilation of the nettle-pbkdf.o module
Reported-by: Wen Congyang <wency@cn.fujitsu.com>
Tested-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.objs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index 9f2c87eafa..0737f48118 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -11,8 +11,8 @@ crypto-obj-y += secret.o crypto-obj-$(CONFIG_GCRYPT) += random-gcrypt.o crypto-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS_RND)) += random-gnutls.o crypto-obj-y += pbkdf.o -crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o -crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT_KDF)) += pbkdf-gcrypt.o +crypto-obj-$(CONFIG_NETTLE_KDF) += pbkdf-nettle.o +crypto-obj-$(if $(CONFIG_NETTLE_KDF),n,$(CONFIG_GCRYPT_KDF)) += pbkdf-gcrypt.o crypto-obj-y += ivgen.o crypto-obj-y += ivgen-essiv.o crypto-obj-y += ivgen-plain.o |