mbox

[PULL,v1,0/4] Merge qcrypto 2017/05/07

Message ID 20170509134623.13120-1-berrange@redhat.com
State New
Headers show

Pull-request

git://github.com/berrange/qemu tags/pull-qcrypto-2017-05-09-1

Message

Daniel P. Berrangé May 9, 2017, 1:46 p.m. UTC
The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:

  Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)

are available in the git repository at:

  git://github.com/berrange/qemu tags/pull-qcrypto-2017-05-09-1

for you to fetch changes up to a37278169d0d7d33270c6817f4a2e4f7345e1098:

  crypto: qcrypto_random_bytes() now works on windows w/o any other crypto libs (2017-05-09 14:41:47 +0100)

----------------------------------------------------------------
Merge qcrypto 2017/05/09 v1

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

Daniel P. Berrange (3):
  Default to GSSAPI (Kerberos) instead of DIGEST-MD5 for SASL
  List SASL config file under the cryptography maintainer's realm
  crypto: move 'opaque' parameter to (nearly) the end of parameter list

Geert Martin Ijewski (1):
  crypto: qcrypto_random_bytes() now works on windows w/o any other
    crypto libs

 MAINTAINERS               |  1 +
 block/crypto.c            |  6 +++---
 crypto/block-luks.c       | 13 +++++++-----
 crypto/init.c             |  6 ++++++
 crypto/random-gcrypt.c    |  2 ++
 crypto/random-gnutls.c    |  3 +++
 crypto/random-platform.c  | 45 ++++++++++++++++++++++++++++++++-------
 include/crypto/block.h    |  6 +++---
 include/crypto/random.h   |  9 ++++++++
 qemu-doc.texi             | 50 +++++++++++++++++++++++++------------------
 qemu.sasl                 | 54 +++++++++++++++++++++++++++--------------------
 tests/test-crypto-block.c |  6 +++---
 12 files changed, 135 insertions(+), 66 deletions(-)

Comments

Stefan Hajnoczi May 10, 2017, 3:26 p.m. UTC | #1
On Tue, May 09, 2017 at 02:46:19PM +0100, Daniel P. Berrange wrote:
> The following changes since commit dd1559bb267becbb838de41132ef60771d183e5d:
> 
>   Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging (2017-05-05 17:07:55 +0100)
> 
> are available in the git repository at:
> 
>   git://github.com/berrange/qemu tags/pull-qcrypto-2017-05-09-1
> 
> for you to fetch changes up to a37278169d0d7d33270c6817f4a2e4f7345e1098:
> 
>   crypto: qcrypto_random_bytes() now works on windows w/o any other crypto libs (2017-05-09 14:41:47 +0100)
> 
> ----------------------------------------------------------------
> Merge qcrypto 2017/05/09 v1
> 
> ----------------------------------------------------------------
> 
> Daniel P. Berrange (3):
>   Default to GSSAPI (Kerberos) instead of DIGEST-MD5 for SASL
>   List SASL config file under the cryptography maintainer's realm
>   crypto: move 'opaque' parameter to (nearly) the end of parameter list
> 
> Geert Martin Ijewski (1):
>   crypto: qcrypto_random_bytes() now works on windows w/o any other
>     crypto libs
> 
>  MAINTAINERS               |  1 +
>  block/crypto.c            |  6 +++---
>  crypto/block-luks.c       | 13 +++++++-----
>  crypto/init.c             |  6 ++++++
>  crypto/random-gcrypt.c    |  2 ++
>  crypto/random-gnutls.c    |  3 +++
>  crypto/random-platform.c  | 45 ++++++++++++++++++++++++++++++++-------
>  include/crypto/block.h    |  6 +++---
>  include/crypto/random.h   |  9 ++++++++
>  qemu-doc.texi             | 50 +++++++++++++++++++++++++------------------
>  qemu.sasl                 | 54 +++++++++++++++++++++++++++--------------------
>  tests/test-crypto-block.c |  6 +++---
>  12 files changed, 135 insertions(+), 66 deletions(-)
> 
> -- 
> 2.9.3
> 
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan