[Qemu-devel] [PULL v1 0/2] QCrypto fixes for 2.6.0-rc1

[Qemu-devel] [PULL v1 0/2] QCrypto fixes for 2.6.0-rc1

[Daniel P. Berrange]

The following changes since commit 1dbc7cc9b91ba229ec958418bef483364f06fe72:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160405' into staging (2016-04-05 09:32:35 +0100)

are available in the git repository at:

  git://github.com/berrange/qemu tags/pull-qcrypto-2016-04-05-1

for you to fetch changes up to c44e92a4151248f80a31c8aa7343e399e508fa95:

  crypto: fix nettle config check for running pbkdf test (2016-04-05 10:52:57 +0100)

----------------------------------------------------------------
Merge QCrypto fixes 2016/04/05 v1

----------------------------------------------------------------

Daniel P. Berrange (2):
  crypto: fix typo in docs for secret object type
  crypto: fix nettle config check for running pbkdf test

 qemu-options.hx | 2 +-
 tests/Makefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.5.5

[Qemu-devel] [PULL v1 1/2] crypto: fix typo in docs for secret object type

[Daniel P. Berrange]

The docs for the secret object type specified the wrong number
of bytes for the AES initialization vector.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 qemu-options.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 789d9f6..587de8f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3888,7 +3888,7 @@ parameter provides the ID of a previously defined secret that contains
 the AES-256 decryption key. This key should be 32-bytes long and be
 base64 encoded. The @var{iv} parameter provides the random initialization
 vector used for encryption of this particular secret and should be a
-base64 encrypted string of the 32-byte IV.
+base64 encrypted string of the 16-byte IV.
 
 The simplest (insecure) usage is to provide the secret inline
 
-- 
2.5.5

[Qemu-devel] [PULL v1 2/2] crypto: fix nettle config check for running pbkdf test

[Daniel P. Berrange]

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>
Tested-by: Bruce Rogers <brogers@suse.com>
Tested-by: Ed Maste <emaste@freebsd.org>
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

Re: [Qemu-devel] [PULL v1 0/2] QCrypto fixes for 2.6.0-rc1

[Peter Maydell]

On 5 April 2016 at 10:55, Daniel P. Berrange <berrange@redhat.com> wrote:
> The following changes since commit 1dbc7cc9b91ba229ec958418bef483364f06fe72:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160405' into staging (2016-04-05 09:32:35 +0100)
>
> are available in the git repository at:
>
>   git://github.com/berrange/qemu tags/pull-qcrypto-2016-04-05-1
>
> for you to fetch changes up to c44e92a4151248f80a31c8aa7343e399e508fa95:
>
>   crypto: fix nettle config check for running pbkdf test (2016-04-05 10:52:57 +0100)
>
> ----------------------------------------------------------------
> Merge QCrypto fixes 2016/04/05 v1
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM