qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test
@ 2016-04-04 15:24 Daniel P. Berrange
  2016-04-04 20:01 ` Bruce Rogers
  2016-04-05  9:40 ` Paolo Bonzini
  0 siblings, 2 replies; 5+ messages in thread
From: Daniel P. Berrange @ 2016-04-04 15:24 UTC (permalink / raw)
  To: qemu-devel; +Cc: Dr. David Alan Gilbert, Bruce Rogers

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" <dgilbert@redhat.com>
Reported-by: Bruce Rogers <brogers@suse.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 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)
-- 
2.5.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test
  2016-04-04 15:24 [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test Daniel P. Berrange
@ 2016-04-04 20:01 ` Bruce Rogers
  2016-04-05  1:19   ` Ed Maste
  2016-04-05  9:40 ` Paolo Bonzini
  1 sibling, 1 reply; 5+ messages in thread
From: Bruce Rogers @ 2016-04-04 20:01 UTC (permalink / raw)
  To: qemu-devel, Daniel P. Berrange; +Cc: Dr. David Alan Gilbert

>>> On 4/4/2016 at 09:24 AM, "Daniel P. Berrange" <berrange@redhat.com> 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" <dgilbert@redhat.com>
> Reported-by: Bruce Rogers <brogers@suse.com>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  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)

This is the same patch I've been running with - which has worked fine for me.
Thanks!

Bruce

Tested-by: Bruce Rogers <brogers@suse.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test
  2016-04-04 20:01 ` Bruce Rogers
@ 2016-04-05  1:19   ` Ed Maste
  0 siblings, 0 replies; 5+ messages in thread
From: Ed Maste @ 2016-04-05  1:19 UTC (permalink / raw)
  To: Bruce Rogers; +Cc: qemu-devel, Dr. David Alan Gilbert

On 4 April 2016 at 20:01, Bruce Rogers <brogers@suse.com> wrote:
>>>> On 4/4/2016 at 09:24 AM, "Daniel P. Berrange" <berrange@redhat.com> 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" <dgilbert@redhat.com>
>> Reported-by: Bruce Rogers <brogers@suse.com>
>> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
>> ---
>>  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)
>
> This is the same patch I've been running with - which has worked fine for me.
> Thanks!
>
> Bruce
>
> Tested-by: Bruce Rogers <brogers@suse.com>

This fixes one of the three FreeBSD test failures I reported earlier
in the thread "[PATCH v2 0/2] Fix for compile on FreeBSD/i386 (and
others?)".

Tested-by: Ed Maste <emaste@freebsd.org>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test
  2016-04-04 15:24 [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test Daniel P. Berrange
  2016-04-04 20:01 ` Bruce Rogers
@ 2016-04-05  9:40 ` Paolo Bonzini
  2016-04-05  9:58   ` Peter Maydell
  1 sibling, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2016-04-05  9:40 UTC (permalink / raw)
  To: Daniel P. Berrange, qemu-devel
  Cc: Peter Maydell, Dr. David Alan Gilbert, Bruce Rogers



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" <dgilbert@redhat.com>
> Reported-by: Bruce Rogers <brogers@suse.com>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  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?

Thanks,

Paolo

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test
  2016-04-05  9:40 ` Paolo Bonzini
@ 2016-04-05  9:58   ` Peter Maydell
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2016-04-05  9:58 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: Bruce Rogers, QEMU Developers, Dr. David Alan Gilbert

On 5 April 2016 at 10:40, Paolo Bonzini <pbonzini@redhat.com> 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" <dgilbert@redhat.com>
>> Reported-by: Bruce Rogers <brogers@suse.com>
>> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
>> ---
>>  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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-04-05  9:58 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-04 15:24 [Qemu-devel] [PATCH] crypto: fix nettle config check for running pbkdf test Daniel P. Berrange
2016-04-04 20:01 ` Bruce Rogers
2016-04-05  1:19   ` Ed Maste
2016-04-05  9:40 ` Paolo Bonzini
2016-04-05  9:58   ` Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).