mbox

[PULL,v1,0/6] Merge qcrypto patch queue

Message ID 1467644189-31641-1-git-send-email-berrange@redhat.com
State New
Headers show

Pull-request

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

Message

Daniel P. Berrangé July 4, 2016, 2:56 p.m. UTC
The following changes since commit 96b39d8327883094f52b0a3d3f25dba83d6d1d63:

  Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2016-07-01 19:29:27 +0100)

are available in the git repository at:

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

for you to fetch changes up to a1c5e949ddc3234dcb85a44b9cb9312cd9f3522f:

  crypto: allow default TLS priority to be chosen at build time (2016-07-04 15:53:19 +0100)

----------------------------------------------------------------
Merge qcrypto 2016/07/04 v1

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

Daniel P. Berrange (6):
  crypto: fix handling of iv generator hash defaults
  crypto: rename OUT to out in xts test to avoid clash on MinGW
  crypto: switch hash code to use nettle/gcrypt directly
  crypto: implement sha224, sha384, sha512 and ripemd160 hashes
  crypto: add support for TLS priority string override
  crypto: allow default TLS priority to be chosen at build time

 configure                  |  20 ++--
 crypto/Makefile.objs       |   3 +
 crypto/block-luks.c        |  21 ++++
 crypto/hash-gcrypt.c       | 110 +++++++++++++++++++++
 crypto/hash-nettle.c       | 155 +++++++++++++++++++++++++++++
 crypto/hash-stub.c         |  41 ++++++++
 crypto/hash.c              | 109 +-------------------
 crypto/tlscreds.c          |  26 +++++
 crypto/tlssession.c        |  26 +++--
 include/crypto/tlscreds.h  |   1 +
 qapi/crypto.json           |   6 +-
 tests/Makefile.include     |   2 +-
 tests/qemu-iotests/149     |  12 +++
 tests/qemu-iotests/149.out | 240 +++++++++++++++++++++++++++++++++++++++++++++
 tests/test-crypto-hash.c   |  53 +++++++++-
 tests/test-crypto-xts.c    |  18 ++--
 16 files changed, 704 insertions(+), 139 deletions(-)
 create mode 100644 crypto/hash-gcrypt.c
 create mode 100644 crypto/hash-nettle.c
 create mode 100644 crypto/hash-stub.c

Comments

Peter Maydell July 4, 2016, 4:27 p.m. UTC | #1
On 4 July 2016 at 15:56, Daniel P. Berrange <berrange@redhat.com> wrote:
> The following changes since commit 96b39d8327883094f52b0a3d3f25dba83d6d1d63:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (2016-07-01 19:29:27 +0100)
>
> are available in the git repository at:
>
>   git://github.com/berrange/qemu tags/pull-qcrypto-2016-07-04-1
>
> for you to fetch changes up to a1c5e949ddc3234dcb85a44b9cb9312cd9f3522f:
>
>   crypto: allow default TLS priority to be chosen at build time (2016-07-04 15:53:19 +0100)
>
> ----------------------------------------------------------------
> Merge qcrypto 2016/07/04 v1
>
> ----------------------------------------------------------------
>
> Daniel P. Berrange (6):
>   crypto: fix handling of iv generator hash defaults
>   crypto: rename OUT to out in xts test to avoid clash on MinGW
>   crypto: switch hash code to use nettle/gcrypt directly
>   crypto: implement sha224, sha384, sha512 and ripemd160 hashes
>   crypto: add support for TLS priority string override
>   crypto: allow default TLS priority to be chosen at build time

Applied, thanks.

-- PMM