Re: [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test

[Peter Maydell]

On 5 April 2016 at 10:40, Paolo Bonzini <address@hidden> wrote:
>
>
> On 04/04/2016 17:24, Daniel P. Berrange wrote:
>> The pbkdf test is being built based on a check for CONFIG_NETTLE.
>> As of fff2f982ab6ac0dd2b641d30303f72270a019f28, it should be
>> instead checking CONFIG_NETTLE_KDF
>>
>> Reported-by: "Dr. David Alan Gilbert" <address@hidden>
>> Reported-by: Bruce Rogers <address@hidden>
>> Signed-off-by: Daniel P. Berrange <address@hidden>
>> ---
>>  tests/Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/Makefile b/tests/Makefile
>> index 45b9048..651d8b2 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)
>
> Peter, could you please apply this directly to master for rc1?

Dan's just sent a pullreq with it in, so I'll apply it via that.

thanks
-- PMM